From 1576b6321b9486090f401e4bdac647c3a7548db0 Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Wed, 14 Dec 2022 18:14:49 +0300
Subject: [PATCH] feat(rust): update crane builder, make sure vendor dir
 reference removal works

---
 flake.lock                                     | 6 +++---
 src/subsystems/rust/builders/crane/default.nix | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index c9efb4ee..b0070774 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
     "crane": {
       "flake": false,
       "locked": {
-        "lastModified": 1670284777,
-        "narHash": "sha256-JF0pc0s4z/X+Iy+lNHOwUQ8I5bz+q7uX4HrKTNIEj24=",
+        "lastModified": 1670900067,
+        "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "2243fb9c872de25cb564a02d324ea6a5b9853052",
+        "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b",
         "type": "github"
       },
       "original": {
diff --git a/src/subsystems/rust/builders/crane/default.nix b/src/subsystems/rust/builders/crane/default.nix
index 289be9ac..85524e47 100644
--- a/src/subsystems/rust/builders/crane/default.nix
+++ b/src/subsystems/rust/builders/crane/default.nix
@@ -55,10 +55,12 @@
         inherit pname version;
 
         src = utils.getRootSource pname version;
-        cargoVendorDir = "./nix-vendor";
+        cargoVendorDir = "$TMPDIR/nix-vendor";
+        installCargoArtifactsMode = "use-zstd";
 
         postUnpack = ''
           export CARGO_HOME=$(pwd)/.cargo_home
+          export cargoVendorDir="$TMPDIR/nix-vendor"
         '';
         preConfigure = ''
           ${writeGitVendorEntries}
@@ -86,7 +88,7 @@
           cargoCheckCommand = "cargo check --release --package ${pname}";
           dream2nixVendorDir = vendoring.vendoredDependencies;
           preUnpack = ''
-            ${vendoring.copyVendorDir "$dream2nixVendorDir" "$cargoVendorDir"}
+            ${vendoring.copyVendorDir "$dream2nixVendorDir" common.cargoVendorDir}
           '';
           # move the vendored dependencies folder to $out for main derivation to use
           postInstall = ''
@@ -105,7 +107,7 @@
           cargoArtifacts = deps;
           # link the vendor dir we used earlier to the correct place
           preUnpack = ''
-            ${vendoring.copyVendorDir "$cargoArtifacts/nix-vendor" "$cargoVendorDir"}
+            ${vendoring.copyVendorDir "$cargoArtifacts/nix-vendor" common.cargoVendorDir}
           '';
           # write our cargo lock
           # note: we don't do this in buildDepsOnly since