Add PKG_CONFIG_PATH

informalsystems · Dec 9, 2024 · 2ec9914 · 2ec9914
1 parent 7d41316
commit 2ec9914
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/flake.nix b/flake.nix
@@ -102,7 +102,7 @@
               taplo
               just
               openssl
-              pkgconfig
+              pkg-config
               ;
 
             nixfmt = nixpkgs.nixfmt-rfc-style;
@@ -116,31 +116,31 @@
           shell-deps = (builtins.attrValues starknet-pkgs) ++ (builtins.attrValues tools) ++ mac-deps;
         in
         {
-          packages = {
-            inherit
-              starknet-devnet
-              cairo
-              scarb
-              rust
-              rust-nightly
-              rust-wasm
-              ;
-          } // tools // starknet-pkgs;
+          packages =
+            {
+              inherit
+                starknet-devnet
+                cairo
+                scarb
+                rust
+                rust-nightly
+                rust-wasm
+                ;
+            }
+            // tools
+            // starknet-pkgs;
 
           devShells = {
             default = nixpkgs.mkShell { buildInputs = shell-deps; };
 
             rust = nixpkgs.mkShell {
-              buildInputs = [ rust ] ++ shell-deps;
-
-              shellHook = ''
-                export PKG_CONFIG_PATH="${nixpkgs.openssl.dev}/lib/pkgconfig";
-              '';
+              PKG_CONFIG_PATH = "${nixpkgs.openssl.dev}/lib/pkgconfig";
+              buildInputs = [ rust ] ++ (builtins.attrValues tools);
             };
 
-            rust-nightly = nixpkgs.mkShell { buildInputs = [ rust-nightly ] ++ shell-deps; };
+            rust-nightly = nixpkgs.mkShell { buildInputs = [ rust-nightly ] ++ (builtins.attrValues tools); };
 
-            rust-wasm = nixpkgs.mkShell { buildInputs = [ rust-wasm ] ++ shell-deps; };
+            rust-wasm = nixpkgs.mkShell { buildInputs = [ rust-wasm ] ++ (builtins.attrValues tools); };
           };
 
           formatter = tools.nixfmt;