* useDietLibC: work properly on impure stdenvs.

* dietlibc: pass glibc explicitly.

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

pkgs/os-specific/linux/dietlibc/default.nix

@@ -1,6 +1,6 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, glibc}:
 
-assert stdenv.system == "i686-linux";
+assert stdenv.isLinux;
 
 stdenv.mkDerivation {
   name = "dietlibc-0.30";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     md5 = "2465d652fff6f1fad3da3b98e60e83c9";
   };
   builder = ./builder.sh;
-  inherit (stdenv) glibc;
+  inherit glibc;
 
   patches = [
 

pkgs/top-level/all-packages.nix

@@ -94,10 +94,9 @@ rec {
           + " --disable-shared"; # brrr...
 
         NIX_GCC = import ../build-support/gcc-wrapper {
-          inherit stdenv binutils;
-          gcc = gcc.gcc;
+          inherit stdenv;
           glibc = dietlibc;
-          nativeTools = false;
+          inherit (gcc) gcc binutils name nativeTools nativePrefix;
           nativeGlibc = false;
         };
       });
@@ -2034,7 +2033,7 @@ rec {
   #};
 
   dietlibc = import ../os-specific/linux/dietlibc {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv glibc;
   };
 
   #dietlibcArm = import ../os-specific/linux/dietlibc-cross {