cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #143580 from lovesegfault/revert-143076

Browse source 
Revert "makeRustPlatform: allow to easily override stdenv"
This commit is contained in:
Jörg Thalheim 2021-10-29 09:31:56 +02:00 committed by GitHub
commit e0ebde1fe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/compilers/rust/make-rust-platform.nix
View file

@ -1,6 +1,6 @@
{ buildPackages, callPackage, stdenv }@prev: { buildPackages, callPackage }:
{ rustc, cargo, stdenv ? prev.stdenv, ... }: { rustc, cargo, ... }:
rec { rec {
rust = { rust = {
@ -9,27 +9,27 @@ rec {
fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix { fetchCargoTarball = buildPackages.callPackage ../../../build-support/rust/fetchCargoTarball.nix {
git = buildPackages.gitMinimal; git = buildPackages.gitMinimal;
inherit stdenv cargo; inherit cargo;
}; };
buildRustPackage = callPackage ../../../build-support/rust { buildRustPackage = callPackage ../../../build-support/rust {
git = buildPackages.gitMinimal; git = buildPackages.gitMinimal;
inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
fetchCargoTarball importCargoLock rustc; fetchCargoTarball importCargoLock rustc;
}; };
importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {}; importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};
rustcSrc = callPackage ./rust-src.nix { rustcSrc = callPackage ./rust-src.nix {
inherit stdenv rustc; inherit rustc;
}; };
rustLibSrc = callPackage ./rust-lib-src.nix { rustLibSrc = callPackage ./rust-lib-src.nix {
inherit stdenv rustc; inherit rustc;
}; };
# Hooks # Hooks
inherit (callPackage ../../../build-support/rust/hooks { inherit (callPackage ../../../build-support/rust/hooks {
inherit stdenv cargo rustc; inherit cargo rustc;
}) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook; }) cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook maturinBuildHook;
} }