diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2016-04-27 09:09:27 -0700 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2016-11-06 21:28:38 -0800 |
| commit | 6bfe04277f40a0da27fa6373edfb24a6b139548b (patch) | |
| tree | 222265464db294577bc8ea56b7a3c99c2847d6be /pkgs/stdenv/default.nix | |
| parent | ea7bf0226825e21555eda1fd57d93762b376188d (diff) | |
top-level: Make config-overriden stdenv bootstrap more normally
Diffstat (limited to 'pkgs/stdenv/default.nix')
| -rw-r--r-- | pkgs/stdenv/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 59088bfdf3bfd..10086ee6a8536 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -40,9 +40,12 @@ rec { inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross; + inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom; + # Select the appropriate stdenv for the platform `system'. stdenv = if crossSystem != null then stdenvCross else + if config ? replaceStdenv then stdenvCustom else if system == "i686-linux" then stdenvLinux else if system == "x86_64-linux" then stdenvLinux else if system == "armv5tel-linux" then stdenvLinux else |