* stdenv-nix-linux should more-or-less work again now.

svn path=/nixpkgs/trunk/; revision=826

pkgs/test/simple/builder.sh

@@ -4,7 +4,7 @@ export NIX_DEBUG=1
 
 . $stdenv/setup
 
-#export NIX_CFLAGS_COMPILE="-v $NIX_CFLAGS_COMPILE"
+export NIX_ENFORCE_PURITY=1
 
 mkdir $out
 mkdir $out/bin
@@ -24,6 +24,8 @@ gcc -L /nix/store/abcd/lib -isystem /usr/lib hello.c -o $out/bin/hello
 
 $out/bin/hello
 
+exit 0
+
 cat > hello2.cc <<EOF
 #include <iostream>
 

pkgs/test/simple/default.nix

@@ -1,12 +1,12 @@
 let {
   system = "i686-linux";
 
-  stdenvInitial = (import ../../stdenv/initial) {
-    name = "stdenv-initial";
-    inherit system;
+  stdenvs = (import ../../system/stdenvs.nix) {
+    system = "i686-linux";
+    allPackages = import ../../system/all-packages-generic.nix;
   };
 
-  stdenv = (import ../../stdenv/native) {stdenv = stdenvInitial;};
+  stdenv = stdenvs.stdenvLinuxBoot1;
 
   test = derivation {
     name = "simple-test";