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

top-level: Make stdenvCross which appears at first glance normal...

Browse Source 
...but actually is weird just like the original
This commit is contained in:
John Ericson
2016-11-06 21:27:38 -08:00
parent eed34bd214
commit e22346c35e
4 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/default.nix
+5 -2
View File
@@ -5,7 +5,7 @@
# Posix utilities, the GNU C compiler, and so on. On other systems,
# we use the native C library.
{ system, allPackages ? import ../.., platform, config, lib }:
{ system, allPackages ? import ../.., platform, config, crossSystem, lib }:
rec {
@@ -36,10 +36,13 @@ rec {
# Linux standard environment.
inherit (import ./linux { inherit system allPackages platform config lib; }) stdenvLinux;
inherit (import ./darwin { inherit system allPackages platform config;}) stdenvDarwin;
inherit (import ./darwin { inherit system allPackages platform config; }) stdenvDarwin;
inherit (import ./cross { inherit system allPackages platform crossSystem config lib; }) stdenvCross;
# Select the appropriate stdenv for the platform `system'.
stdenv =
if crossSystem != null then stdenvCross else
if system == "i686-linux" then stdenvLinux else
if system == "x86_64-linux" then stdenvLinux else
if system == "armv5tel-linux" then stdenvLinux else