JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
makeRustPlatform: allow to easily override stdenv
This commit is contained in:
Bernardo Meurer 2021-11-01 11:21:35 -07:00 committed by GitHub
commit 15e457bd84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/compilers/rust/make-rust-platform.nix
View File

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