Updating from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=22254

pkgs/os-specific/linux/klibc/1.5.nix

@@ -1,34 +0,0 @@
-{stdenv, fetchurl, perl, bison, mktemp, linuxHeaders}:
-
-assert stdenv.isLinux;
-
-let version = "1.5"; in
-
-stdenv.mkDerivation {
-  name = "klibc-${version}";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/libs/klibc/klibc-${version}.tar.bz2";
-    sha256 = "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017";
-  };
-  
-  makeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"];
-  
-  preBuild = ''
-    makeFlags=$(eval "echo $makeFlags")
-
-    mkdir linux
-    cp -prsd ${linuxHeaders}/include linux/
-    chmod -R u+w linux/include/
-  ''; # */
-  
-  # Install static binaries as well.
-  postInstall = ''
-    dir=$out/lib/klibc/bin.static
-    mkdir $dir
-    cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/
-    cp usr/dash/sh $dir/
-  '';
-  
-  buildInputs = [perl bison mktemp];
-}

pkgs/os-specific/linux/klibc/builder.sh

@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-preBuild() {
-    mkdir -p linux/include
-    cp -prd $kernel/lib/modules/*/build/include/* linux/include/
-    chmod -R u+w linux/include/
-}
-
-makeFlagsArray=(V=1 prefix=$out SHLIBDIR=$out/lib)
-
-genericBuild

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

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   name = "klibc-${version}";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/libs/klibc/Testing/klibc-${version}.tar.bz2";
+    url = "mirror://kernel/linux/libs/klibc/klibc-${version}.tar.bz2";
     sha256 = "1x401wmjca6zkyikf9xz45b3wb1hnj0m2s9in1sg6xdhi3pk8lwb";
   };