Attempt fix vendor

holochain-open-dev · May 28, 2024 · 94295b6 · 94295b6
1 parent 1fc0571
commit 94295b6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/flake.nix b/flake.nix
@@ -123,8 +123,6 @@
                   holochainAppDeps.nativeBuildInputs { inherit pkgs lib; };
                 CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS =
                   " -Clink-arg=-fuse-ld=mold";
-                # CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS =
-                #   " -Clink-arg=-fuse-ld=mold -Clink-arg=-fuse-ld=mold";
                 CARGO_PROFILE = if debug then "debug" else "release";
               };
 

diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock
diff --git a/nix/reference-happ/Cargo.toml b/nix/reference-happ/Cargo.toml
@@ -6,7 +6,10 @@ resolver = "2"
 hdi = "0.4.1-rc"
 hdk = "0.3.1-rc"
 holochain = "0.3.1-rc"
-serde = "1"
+serde = "1.0.193"
+
+[profile.dev]
+opt-level = "z"
 
 [profile.release]
 opt-level = "z"
diff --git a/nix/zome.nix b/nix/zome.nix
@@ -1,5 +1,5 @@
-{ runCommandLocal, runCommandNoCC, binaryen, deterministicCraneLib, craneLib
-, workspacePath, crateCargoToml, zomeCargoDeps }:
+{ pkgs, runCommandLocal, runCommandNoCC, binaryen, deterministicCraneLib
+, craneLib, workspacePath, crateCargoToml, zomeCargoDeps }:
 
 let
   cargoToml = builtins.fromTOML (builtins.readFile crateCargoToml);
@@ -17,9 +17,15 @@ let
     cargoToml = crateCargoToml;
   };
 
+  cargoVendorDir = craneLib.vendorMultipleCargoDeps {
+    cargoLockList =
+      [ ./reference-happ/Cargo.lock (workspacePath + /Cargo.lock) ];
+  };
+
   wasm = craneLib.buildPackage (commonArgs // {
     cargoArtifacts = (zomeCargoDeps { inherit craneLib; }).cargoArtifacts;
-    cargoVendorDir = (zomeCargoDeps { inherit craneLib; }).cargoVendorDir;
+    inherit cargoVendorDir;
+    # = (zomeCargoDeps { inherit craneLib; }).cargoVendorDir;
   });
 
   deterministicWasm = let