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

top-level: Make config-overriden stdenv bootstrap more normally

Browse Source
This commit is contained in:
John Ericson
2016-11-06 21:28:38 -08:00
parent ea7bf02268
commit 6bfe04277f
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/default.nix
+3
View File
@@ -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