1 files changed, 9 insertions, 16 deletions
diff --git a/pkgs/system/stdenvs.nix b/pkgs/system/stdenvs.nix
index b6f74e5d59c94..efbbcb0faada2 100644
--- a/pkgs/system/stdenvs.nix
+++ b/pkgs/system/stdenvs.nix
@@ -56,6 +56,7 @@
   stdenvLinuxBoot0 = (import ../stdenv/nix-linux-static).stdenvBootFun {
     # Use the statically linked, downloaded glibc/gcc/binutils.
     inherit (import ../stdenv/nix-linux-static) glibc gcc binutils;
+    staticGlibc = true;
   };
 
   stdenvLinuxBoot0Pkgs = allPackages {
@@ -75,9 +76,10 @@
   #    prevent impurity in the things it builds (e.g., through
   #    `-lncurses').
   stdenvLinuxBoot1 = (import ../stdenv/nix-linux-static).stdenvBootFun {
-    # Use the statically linked, downloaded gcc/binutils, but the
-    # glibc we just built. 
+    # Use the statically linked gcc/binutils, but the glibc we just
+    # built.
     glibc = stdenvLinuxGlibc;
+    staticGlibc = false;
     inherit (import ../stdenv/nix-linux-static) gcc binutils;
   };
 
@@ -98,6 +100,7 @@
   stdenvLinuxBoot2 = (import ../stdenv/nix-linux-static).stdenvBootFun {
     # Use the glibc/gcc/binutils we just built (but all other tools are still downloaded).
     glibc = stdenvLinuxGlibc;
+    staticGlibc = false;
     inherit (stdenvLinuxBoot1Pkgs) gcc binutils;
   };
 
@@ -159,19 +162,9 @@
   };
 
 
-  # Testing the new stdenv-linux (TODO: remove this eventually).
-  stdenvLinuxTest = (import ../stdenv/nix-linux) {
-    stdenv = stdenvLinuxBoot2;
-    pkgs = stdenvLinuxBoot2Pkgs;
-    glibc = stdenvLinuxGlibc;
-    genericStdenv = import ../stdenv/generic-branch;
-    inherit gccWrapper;
-  };
-
-  stdenvDarwinTest = (import ../stdenv/darwin) {
-    stdenv = stdenvInitial;
-    genericStdenv = import ../stdenv/generic-branch;
-    inherit gccWrapper;
+  stdenvTestPkgs = allPackages {
+    stdenv = (import ../stdenv/nix-linux-static).stdenvInitial;
+    bootCurl = (import ../stdenv/nix-linux-static).curl;
+    noSysDirs = true;
   };
-    
 }