Merge pull request #144143 from lovesegfault/make-rust-platform-stdenv-redux

makeRustPlatform: allow to easily override stdenv

authored by

Bernardo Meurer and committed by
GitHub
15e457bd 404254c8

+6 -6
+6 -6
pkgs/development/compilers/rust/make-rust-platform.nix
··· 1 - { buildPackages, callPackage }: 2 3 - { rustc, cargo, ... }: 4 5 rec { 6 rust = { ··· 14 15 buildRustPackage = callPackage ../../../build-support/rust { 16 git = buildPackages.gitMinimal; 17 - inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook 18 fetchCargoTarball importCargoLock rustc; 19 }; 20 21 importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; 22 23 rustcSrc = callPackage ./rust-src.nix { 24 - inherit rustc; 25 }; 26 27 rustLibSrc = callPackage ./rust-lib-src.nix { 28 - inherit rustc; 29 }; 30 31 # Hooks 32 inherit (callPackage ../../../build-support/rust/hooks { 33 - inherit cargo rustc; 34 }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; 35 }
··· 1 + { buildPackages, callPackage, stdenv }@prev: 2 3 + { rustc, cargo, stdenv ? prev.stdenv, ... }: 4 5 rec { 6 rust = { ··· 14 15 buildRustPackage = callPackage ../../../build-support/rust { 16 git = buildPackages.gitMinimal; 17 + inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook 18 fetchCargoTarball importCargoLock rustc; 19 }; 20 21 importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; 22 23 rustcSrc = callPackage ./rust-src.nix { 24 + inherit stdenv rustc; 25 }; 26 27 rustLibSrc = callPackage ./rust-lib-src.nix { 28 + inherit stdenv rustc; 29 }; 30 31 # Hooks 32 inherit (callPackage ../../../build-support/rust/hooks { 33 + inherit stdenv cargo rustc; 34 }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; 35 }