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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-01-05 10:28:58 +01:00
parent 556a28908e b054851d18
commit b1acaffe67
161 changed files with 1976 additions and 1690 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/default.nix
+1 -8
View File
@@ -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