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

stdenv-darwin: rename folder and associated attribute

Browse Source 
No point in calling it pure-darwin anymore. It's the only stdenv we have
This commit is contained in:
Dan Peebles
2016-01-03 21:08:40 -05:00
parent 01b0b3cec0
commit 88c41e1f95
6 changed files with 2 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/default.nix
+2 -6
View File
@@ -36,11 +36,7 @@ rec {
# Linux standard environment.
stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
# 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;
stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stage5;
# Select the appropriate stdenv for the platform `system'.
stdenv =
@@ -51,7 +47,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