nix-community/dream2nix
1
1
Fork 0
mirror of https://github.com/nix-community/dream2nix.git synced 2024-09-11 14:35:30 +03:00
Code Issues Projects Releases Wiki Activity

fix(rust/crane): don't copy two seperate vendoring folders, instead u… (#287)

Browse Source
This commit is contained in:
Yusuf Bera Ertan 2022-09-03 06:49:53 +03:00 committed by GitHub
parent c6c039fcc6
commit 809bc59402
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/subsystems/rust/builders/crane/default.nix
View File

@ -60,7 +60,6 @@
doNotRemoveReferencesToVendorDir = true;
postUnpack = ''
${vendoring.copyVendorDir "./nix-vendor"}
export CARGO_HOME=$(pwd)/.cargo_home
'';
preConfigure = ''
@ -84,6 +83,13 @@
pnameSuffix = depsNameSuffix;
# Make sure cargo only checks the package we want
cargoCheckCommand = "cargo check --release --package ${pname}";
preUnpack = ''
${vendoring.copyVendorDir "$cargoVendorDir"}
'';
# move the vendored dependencies folder to $out for main derivation to use
postInstall = ''
mv $TMPDIR/nix-vendor $out/nix-vendor
'';
};
deps =
produceDerivation
@ -94,6 +100,10 @@
common
// {
cargoArtifacts = deps;
# link the vendor dir we used earlier to the correct place
preUnpack = ''
ln -sf ${deps}/nix-vendor $cargoVendorDir
'';
# write our cargo lock
# note: we don't do this in buildDepsOnly since
# that uses a cargoLock argument instead