diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-10-29 12:01:19 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-29 12:01:19 +0000 |
commit | 97b60b1800c22850bc7e52596777c8c60dbbd9e6 (patch) | |
tree | 0ee96144793f5c3a7613a388440f3a382e0bb812 /pkgs/development/compilers | |
parent | e7fbce41fcba6290aef3aeffe8a24a2718d4f07e (diff) | |
parent | 85850ea4fccb0223d34695a428f0104de1cf7110 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/rust/make-rust-platform.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index baa29064e20c0..b7379ac677203 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, stdenv }@prev: +{ buildPackages, callPackage }: -{ rustc, cargo, stdenv ? prev.stdenv, ... }: +{ rustc, cargo, ... }: rec { rust = { @@ -9,27 +9,27 @@ rec { fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix { git = buildPackages.gitMinimal; - inherit stdenv cargo; + inherit cargo; }; buildRustPackage = callPackage ../../../build-support/rust { git = buildPackages.gitMinimal; - inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook + inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook fetchCargoTarball importCargoLock rustc; }; importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; rustcSrc = callPackage ./rust-src.nix { - inherit stdenv rustc; + inherit rustc; }; rustLibSrc = callPackage ./rust-lib-src.nix { - inherit stdenv rustc; + inherit rustc; }; # Hooks inherit (callPackage ../../../build-support/rust/hooks { - inherit stdenv cargo rustc; + inherit cargo rustc; }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; } |