diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2016-11-13 10:38:41 -0800 |
|---|---|---|
| committer | John Ericson <jericson@galois.com> | 2016-11-30 19:03:01 -0500 |
| commit | ddeb0d2d6b2e71cf98ab50ab376f802cf29c7c22 (patch) | |
| tree | e3c4665afc06a01d00d41486cfa8816dc0a1f4c2 /pkgs/stdenv/default.nix | |
| parent | b09435ea51caaae1865e667aaa32f7cba4cc4ff2 (diff) | |
top-level: Stop exposing all stdenvs
Diffstat (limited to 'pkgs/stdenv/default.nix')
| -rw-r--r-- | pkgs/stdenv/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 4be34a35acb3f..ac84ea0f9a0b6 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -8,7 +8,7 @@ { system, allPackages ? import ../.., platform, config, crossSystem, lib }: -rec { +let # The native (i.e., impure) build environment. This one uses the @@ -43,7 +43,7 @@ rec { inherit (import ./custom { inherit system allPackages platform crossSystem config lib; }) stdenvCustom; # Select the appropriate stdenv for the platform `system'. - stdenv = +in if crossSystem != null then if crossSystem.useiOSCross or false then stdenvCrossiOS else stdenvCross else @@ -60,5 +60,4 @@ rec { if system == "i686-cygwin" then stdenvNative else if system == "x86_64-cygwin" then stdenvNative else if system == "x86_64-freebsd" then stdenvFreeBSD else - stdenvNative; -} + stdenvNative |