git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #144143 from lovesegfault/make-rust-platform-stdenv-redux

makeRustPlatform: allow to easily override stdenv

commit15e457bd84317cc4bbfc3c48ce091a249b392f7b authorBernardo Meurer <bernardo@meurer.org> dateMon 1 Nov 2021, 11:21 (5 years ago) parent404254c949c9f6
1 file changed+6−6
pkgs/development/compilers/rust/make-rust-platform.nix+6−6
pkgs/development/compilers/rust/make-rust-platform.nix+6−6
@@ -1,6 +1,6 @@
1−{ buildPackages, callPackage }:
1+{ buildPackages, callPackage, stdenv }@prev:
22
3−{ rustc, cargo, ... }:
3+{ rustc, cargo, stdenv ? prev.stdenv, ... }:
44
55rec {
66 rust = {
@@ -14,22 +14,22 @@ rec {
1414
1515 buildRustPackage = callPackage ../../../build-support/rust {
1616 git = buildPackages.gitMinimal;
17− inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
17+ inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
1818 fetchCargoTarball importCargoLock rustc;
1919 };
2020
2121 importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};
2222
2323 rustcSrc = callPackage ./rust-src.nix {
24− inherit rustc;
24+ inherit stdenv rustc;
2525 };
2626
2727 rustLibSrc = callPackage ./rust-lib-src.nix {
28− inherit rustc;
28+ inherit stdenv rustc;
2929 };
3030
3131 # Hooks
3232 inherit (callPackage ../../../build-support/rust/hooks {
33− inherit cargo rustc;
33+ inherit stdenv cargo rustc;
3434 }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
3535}