diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 10:28:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-05 10:28:58 +0100 |
| commit | b1acaffe67afd838900fe22ad35cf0dda24eff63 (patch) | |
| tree | facc558b711b96b0d302fe070963e696e17fa2f3 /pkgs/stdenv/default.nix | |
| parent | 556a28908e01ca1d44962d8570b5e73be949eca6 (diff) | |
| parent | b054851d18585daf67626d92b03fab418c590840 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/stdenv/default.nix')
| -rw-r--r-- | pkgs/stdenv/default.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 37e90faf6d0e1..96f07ae9fc6fd 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -38,15 +38,8 @@ rec { # Linux standard environment. stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux; - # Darwin standard environment. stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin; - # Pure Darwin standard environment. Allows building with the sandbox enabled. To use, - # you can add this to your nixpkgs config: - # - # replaceStdenv = {pkgs}: pkgs.allStdenvs.stdenvDarwinPure - stdenvDarwinPure = (import ./pure-darwin { inherit system allPackages platform config;}).stage5; - # Select the appropriate stdenv for the platform `system'. stdenv = if system == "i686-linux" then stdenvLinux else @@ -56,7 +49,7 @@ rec { if system == "armv7l-linux" then stdenvLinux else if system == "mips64el-linux" then stdenvLinux else if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else - if system == "x86_64-darwin" then stdenvDarwinPure else + if system == "x86_64-darwin" then stdenvDarwin else if system == "x86_64-solaris" then stdenvNix else if system == "i686-cygwin" then stdenvNative else if system == "x86_64-cygwin" then stdenvNative else |