diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-02 00:01:32 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-02 00:01:32 +0000 |
commit | d27dd6653ef32f35d50db3f249ac4658ba18a5b1 (patch) | |
tree | e968f483c0f81f6f6d973ec3e47bb4258a6ac0a6 /pkgs/development/compilers | |
parent | 107b7f5d3931d42c68fe1f51bb62d3d98cf208bf (diff) | |
parent | 550dab224a26ec25e20e82c0c8bfc764e01b772e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/rust/make-rust-platform.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index b7379ac677203..33d826eef5077 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -1,6 +1,6 @@ -{ buildPackages, callPackage }: +{ buildPackages, callPackage, stdenv }@prev: -{ rustc, cargo, ... }: +{ rustc, cargo, stdenv ? prev.stdenv, ... }: rec { rust = { @@ -14,22 +14,22 @@ rec { buildRustPackage = callPackage ../../../build-support/rust { git = buildPackages.gitMinimal; - inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook + inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook fetchCargoTarball importCargoLock rustc; }; importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; rustcSrc = callPackage ./rust-src.nix { - inherit rustc; + inherit stdenv rustc; }; rustLibSrc = callPackage ./rust-lib-src.nix { - inherit rustc; + inherit stdenv rustc; }; # Hooks inherit (callPackage ../../../build-support/rust/hooks { - inherit cargo rustc; + inherit stdenv cargo rustc; }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; } |