swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 02:06:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "makeRustPlatform: allow to easily override stdenv"

Browse source 
This reverts commit f17c3516fb.
This commit is contained in:
Bernardo Meurer 2021-10-28 23:25:35 -07:00
parent f00a6fdb82
commit 00334d352f
No known key found for this signature in database
GPG key ID: F4C0D53B8D14C246
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 {
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;
}