From 88c41e1f958de502cadd63e7803c11e427f5d12c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 3 Jan 2016 21:08:40 -0500
Subject: [PATCH] stdenv-darwin: rename folder and associated attribute

No point in calling it pure-darwin anymore. It's the only stdenv we have
---
 .../{pure-darwin => darwin}/default.nix       |  0
 .../make-bootstrap-tools.nix                  |  0
 .../standard-sandbox.sb                       |  0
 .../unpack-bootstrap-tools.sh                 |  0
 pkgs/stdenv/default.nix                       |  8 +--
 pkgs/stdenv/pure-darwin/trivial-bootstrap.sh  | 66 -------------------
 6 files changed, 2 insertions(+), 72 deletions(-)
 rename pkgs/stdenv/{pure-darwin => darwin}/default.nix (100%)
 rename pkgs/stdenv/{pure-darwin => darwin}/make-bootstrap-tools.nix (100%)
 rename pkgs/stdenv/{pure-darwin => darwin}/standard-sandbox.sb (100%)
 rename pkgs/stdenv/{pure-darwin => darwin}/unpack-bootstrap-tools.sh (100%)
 delete mode 100644 pkgs/stdenv/pure-darwin/trivial-bootstrap.sh

diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/darwin/default.nix
similarity index 100%
rename from pkgs/stdenv/pure-darwin/default.nix
rename to pkgs/stdenv/darwin/default.nix
diff --git a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
similarity index 100%
rename from pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
rename to pkgs/stdenv/darwin/make-bootstrap-tools.nix
diff --git a/pkgs/stdenv/pure-darwin/standard-sandbox.sb b/pkgs/stdenv/darwin/standard-sandbox.sb
similarity index 100%
rename from pkgs/stdenv/pure-darwin/standard-sandbox.sb
rename to pkgs/stdenv/darwin/standard-sandbox.sb
diff --git a/pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
similarity index 100%
rename from pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh
rename to pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 71c50f751b18..44be0ac83f87 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
diff --git a/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh b/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh
deleted file mode 100644
index 0915b378d4f0..000000000000
--- a/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-
-# Building bootstrap tools
-echo Building the trivial bootstrap environment...
-$mkdir -p $out/bin
-
-$ln -s $ln $out/bin/ln
-
-PATH=$out/bin/
-
-cd $out/bin
-
-ln -s $mkdir
-ln -s /bin/sh
-ln -s /bin/cp
-ln -s /bin/mv
-ln -s /bin/rm
-ln -s /bin/ls
-ln -s /bin/ps
-ln -s /bin/cat
-ln -s /bin/bash
-ln -s /bin/echo
-ln -s /bin/expr
-ln -s /bin/test
-ln -s /bin/date
-ln -s /bin/chmod
-ln -s /bin/rmdir
-ln -s /bin/sleep
-ln -s /bin/hostname
-
-ln -s /usr/bin/id
-ln -s /usr/bin/od
-ln -s /usr/bin/tr
-ln -s /usr/bin/wc
-ln -s /usr/bin/cut
-ln -s /usr/bin/cmp
-ln -s /usr/bin/sed
-ln -s /usr/bin/tar
-ln -s /usr/bin/xar
-ln -s /usr/bin/awk
-ln -s /usr/bin/env
-ln -s /usr/bin/tee
-ln -s /usr/bin/comm
-ln -s /usr/bin/cpio
-ln -s /usr/bin/curl
-ln -s /usr/bin/find
-ln -s /usr/bin/grep
-ln -s /usr/bin/gzip
-ln -s /usr/bin/head
-ln -s /usr/bin/tail
-ln -s /usr/bin/sort
-ln -s /usr/bin/uniq
-ln -s /usr/bin/less
-ln -s /usr/bin/true
-ln -s /usr/bin/diff
-ln -s /usr/bin/egrep
-ln -s /usr/bin/fgrep
-ln -s /usr/bin/patch
-ln -s /usr/bin/uname
-ln -s /usr/bin/touch
-ln -s /usr/bin/split
-ln -s /usr/bin/xargs
-ln -s /usr/bin/which
-ln -s /usr/bin/install
-ln -s /usr/bin/basename
-ln -s /usr/bin/dirname
-ln -s /usr/bin/readlink
\ No newline at end of file