summary refs log tree commit diff
path: root/pkgs/build-support/rust
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2021-02-26 10:25:13 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2021-02-26 10:25:13 +0100
commitc456a2512f7a7558cbe25328a423762033822cc0 (patch)
treed64f521751037012a1c4d05fedeb485eeee39b05 /pkgs/build-support/rust
parentbabf9d6100c3e5dcdbbbe8850de99d3fe2b3cf86 (diff)
parent6d7128414cf2763ab14f31365c21c6cec3547dac (diff)
downloadnixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.gz
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.bz2
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.lz
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.xz
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.tar.zst
nixpkgs-c456a2512f7a7558cbe25328a423762033822cc0.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/rust')
-rw-r--r--pkgs/build-support/rust/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index a7bd296d673..bfa6c0d17cd 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -25,6 +25,9 @@
   # Legacy hash
 , cargoSha256 ? ""
 
+  # Name for the vendored dependencies tarball
+, cargoDepsName ? name
+
 , src ? null
 , srcs ? null
 , unpackPhase ? null
@@ -59,7 +62,8 @@ let
 
   cargoDeps = if cargoVendorDir == null
     then fetchCargoTarball ({
-        inherit name src srcs sourceRoot unpackPhase cargoUpdateHook;
+        inherit src srcs sourceRoot unpackPhase cargoUpdateHook;
+        name = cargoDepsName;
         hash = cargoHash;
         patches = cargoPatches;
         sha256 = cargoSha256;