ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

rustPlatform: forward fetchcargo args to stdenv

Browse Source 
Most stdenv wrappers already work like this -- it allows greater
customisation.  We just have to be careful to remove arguments we're
using that shouldn't be passed to stdenv.  I've been conservative
here, because fetchcargo checksums shouldn't change lightly.
This commit is contained in:
Alyssa Ross 2019-12-02 21:08:16 +00:00
parent a63d28e62e
commit 839c9e9344
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/build-support/rust/fetchcargo.nix
View File

@ -26,11 +26,11 @@ in
, cargoUpdateHook ? "" , cargoUpdateHook ? ""
, # whenever to also include the Cargo.lock in the output , # whenever to also include the Cargo.lock in the output
copyLockfile ? false copyLockfile ? false
}: , ...
stdenv.mkDerivation { } @ args:
stdenv.mkDerivation ({
name = "${name}-vendor"; name = "${name}-vendor";
nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ]; nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
inherit src srcs patches sourceRoot;
phases = "unpackPhase patchPhase installPhase"; phases = "unpackPhase patchPhase installPhase";
@ -76,4 +76,6 @@ stdenv.mkDerivation {
impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
preferLocalBuild = true; preferLocalBuild = true;
} } // (builtins.removeAttrs args [
"name" "sha256" "cargoUpdateHook" "copyLockfile"
]))