attempt to combine wasm deps

noir-lang · Sep 14, 2023 · 7f8ba13 · 7f8ba13
1 parent c00d89a
commit 7f8ba13
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/flake.nix b/flake.nix
@@ -102,6 +102,8 @@
       wasmConfig = environment // config // {
         CARGO_TARGET_DIR = "./target";
 
+        CARGO_BUILD_TARGET = "wasm32-unknown-unknown";
+
         nativeBuildInputs = with pkgs; [
           which
           git
@@ -117,13 +119,10 @@
 
       # Build *just* the cargo dependencies, so we can reuse all of that work between runs
       native-cargo-artifacts = craneLib.buildDepsOnly (nativeConfig // {
-        pname = "nargo";
+        pname = "native";
       });
-      noir-wasm-cargo-artifacts = craneLib.buildDepsOnly (wasmConfig // {
-        pname = "noir_wasm";
-      });
-      noirc-abi-wasm-cargo-artifacts = craneLib.buildDepsOnly (wasmConfig // {
-        pname = "noirc_abi_wasm";
+      wasm-cargo-artifacts = craneLib.buildDepsOnly (wasmConfig // {
+        pname = "wasm";
       });
 
       nargo = craneLib.buildPackage (nativeConfig // {
@@ -142,9 +141,9 @@
 
         inherit GIT_COMMIT GIT_DIRTY;
 
-        cargoArtifacts = noir-wasm-cargo-artifacts;
+        cargoArtifacts = wasm-cargo-artifacts;
 
-        cargoExtraArgs = "--package ${pname} --target wasm32-unknown-unknown";
+        cargoExtraArgs = "--package ${pname}";
 
         buildPhaseCargoCommand = ''
           bash compiler/wasm/buildPhaseCargoCommand.sh release
@@ -163,9 +162,9 @@
 
         inherit GIT_COMMIT GIT_DIRTY;
 
-        cargoArtifacts = noirc-abi-wasm-cargo-artifacts;
+        cargoArtifacts = wasm-cargo-artifacts;
 
-        cargoExtraArgs = "--package ${pname} --target wasm32-unknown-unknown";
+        cargoExtraArgs = "--package ${pname}";
 
         buildPhaseCargoCommand = ''
           bash tooling/noirc_abi_wasm/buildPhaseCargoCommand.sh release
@@ -218,8 +217,7 @@
 
         # We expose the `*-cargo-artifacts` derivations so we can cache our cargo dependencies in CI
         inherit native-cargo-artifacts;
-        inherit noir-wasm-cargo-artifacts;
-        inherit noirc-abi-wasm-cargo-artifacts;
+        inherit wasm-cargo-artifacts;
       };
 
       # Setup the environment to match the environment settings, the inputs from our checks derivations,