summary refs log tree commit diff
path: root/pkgs/stdenv/default.nix
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2016-01-03 21:08:40 -0500
committerDan Peebles <pumpkin@me.com>2016-01-03 21:08:40 -0500
commit88c41e1f958de502cadd63e7803c11e427f5d12c (patch)
treeb486cab994eccdbb1b66d2bf2680ba586859502f /pkgs/stdenv/default.nix
parent01b0b3cec0139cc47acca8109fdb4bdbd1734c45 (diff)
downloadnixpkgs-88c41e1f958de502cadd63e7803c11e427f5d12c.tar
nixpkgs-88c41e1f958de502cadd63e7803c11e427f5d12c.tar.gz
nixpkgs-88c41e1f958de502cadd63e7803c11e427f5d12c.tar.bz2
nixpkgs-88c41e1f958de502cadd63e7803c11e427f5d12c.tar.lz
nixpkgs-88c41e1f958de502cadd63e7803c11e427f5d12c.tar.xz
nixpkgs-88c41e1f958de502cadd63e7803c11e427f5d12c.tar.zst
nixpkgs-88c41e1f958de502cadd63e7803c11e427f5d12c.zip
stdenv-darwin: rename folder and associated attribute
No point in calling it pure-darwin anymore. It's the only stdenv we have
Diffstat (limited to 'pkgs/stdenv/default.nix')
-rw-r--r--pkgs/stdenv/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 71c50f751b1..44be0ac83f8 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -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