Fixed nix build packages

darksoil-studio · Jul 17, 2024 · 6dff63b · 6dff63b
1 parent 9558da4
commit 6dff63b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 20 deletions.
diff --git a/crates/hc-pilot/default.nix b/crates/hc-pilot/default.nix
@@ -23,16 +23,19 @@
           ++ (inputs.hc-infra.outputs.lib.holochainAppDeps.nativeBuildInputs {
             inherit pkgs lib;
           });
+
+        # TODO: remove this if possible
+        postPatch = ''
+          mkdir -p "$TMPDIR/nix-vendor"
+          cp -Lr "$cargoVendorDir" -T "$TMPDIR/nix-vendor"
+          sed -i "s|$cargoVendorDir|$TMPDIR/nix-vendor/|g" "$TMPDIR/nix-vendor/config.toml"
+          chmod -R +w "$TMPDIR/nix-vendor"
+          cargoVendorDir="$TMPDIR/nix-vendor"
+        '';
       };
-      cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
-        cargoArtifacts = (self.lib.tauriHappCargoArtifacts { inherit pkgs lib; });
-        version = "workspace";
-        pname = "workspace";
-      });
     in craneLib.buildPackage (commonArgs // {
       pname = crate;
       version = cargoToml.package.version;
-      inherit cargoArtifacts;
     });
   };
 }
diff --git a/crates/scaffold-holochain-runtime/default.nix b/crates/scaffold-holochain-runtime/default.nix
@@ -13,7 +13,8 @@
       crate = cargoToml.package.name;
 
       commonArgs = {
-        src = (self.lib.cleanTauriSource { inherit lib; }) (craneLib.path ../../.);
+        src =
+          (self.lib.cleanTauriSource { inherit lib; }) (craneLib.path ../../.);
         doCheck = false;
         buildInputs = inputs.hc-infra.outputs.lib.holochainAppDeps.buildInputs {
           inherit pkgs lib;
@@ -23,16 +24,18 @@
           ++ (inputs.hc-infra.outputs.lib.holochainAppDeps.nativeBuildInputs {
             inherit pkgs lib;
           });
+        # TODO: remove this if possible
+        postPatch = ''
+          mkdir -p "$TMPDIR/nix-vendor"
+          cp -Lr "$cargoVendorDir" -T "$TMPDIR/nix-vendor"
+          sed -i "s|$cargoVendorDir|$TMPDIR/nix-vendor/|g" "$TMPDIR/nix-vendor/config.toml"
+          chmod -R +w "$TMPDIR/nix-vendor"
+          cargoVendorDir="$TMPDIR/nix-vendor"
+        '';
       };
-      cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
-        cargoArtifacts = (self.lib.tauriHappCargoArtifacts { inherit pkgs lib; });
-        version = "workspace";
-        pname = "workspace";
-      });
     in craneLib.buildPackage (commonArgs // {
       pname = crate;
       version = cargoToml.package.version;
-      inherit cargoArtifacts;
     });
 
   };

diff --git a/crates/scaffold-tauri-happ/default.nix b/crates/scaffold-tauri-happ/default.nix
@@ -12,7 +12,8 @@
       crate = cargoToml.package.name;
 
       commonArgs = {
-        src = (self.lib.cleanTauriSource { inherit lib; }) (craneLib.path ../../.);
+        src =
+          (self.lib.cleanTauriSource { inherit lib; }) (craneLib.path ../../.);
         doCheck = false;
         buildInputs = inputs.hc-infra.outputs.lib.holochainAppDeps.buildInputs {
           inherit pkgs lib;
@@ -22,16 +23,18 @@
           ++ (inputs.hc-infra.outputs.lib.holochainAppDeps.nativeBuildInputs {
             inherit pkgs lib;
           });
+        # TODO: remove this if possible
+        postPatch = ''
+          mkdir -p "$TMPDIR/nix-vendor"
+          cp -Lr "$cargoVendorDir" -T "$TMPDIR/nix-vendor"
+          sed -i "s|$cargoVendorDir|$TMPDIR/nix-vendor/|g" "$TMPDIR/nix-vendor/config.toml"
+          chmod -R +w "$TMPDIR/nix-vendor"
+          cargoVendorDir="$TMPDIR/nix-vendor"
+        '';
       };
-      cargoArtifacts = craneLib.buildDepsOnly (commonArgs // {
-        cargoArtifacts = (self.lib.tauriHappCargoArtifacts { inherit pkgs lib; });
-        version = "workspace";
-        pname = "workspace";
-      });
     in craneLib.buildPackage (commonArgs // {
       pname = crate;
       version = cargoToml.package.version;
-      inherit cargoArtifacts;
     });
   };
 }