* Glibc updated to 2.3.4.

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

2 files changed, 17 insertions, 3 deletions

diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index f9d9845a826b6..55c540e683b1e 100644
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -14,6 +14,15 @@ export LD_LIBRARY_PATH=$glibc/lib
 export PWD_P=$(type -tP pwd)
 
 
+postUnpack=postUnpack
+postUnpack() {
+    cd $sourceRoot
+    unpackFile $linuxthreadsSrc
+    rm -rf nptl
+    cd ..
+}
+
+
 preConfigure=preConfigure
 preConfigure() {
 
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 2231ec97bed10..14e48613d83a6 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -1,13 +1,18 @@
 {stdenv, fetchurl, kernelHeaders, installLocales ? true}:
 
 stdenv.mkDerivation {
-  name = "glibc-2.3.3";
+  name = "glibc-2.3.4";
   builder = ./builder.sh;
   substitute = ../../../build-support/substitute/substitute.sh;
 
   src = fetchurl {
-    url = ftp://sources.redhat.com/pub/glibc/snapshots/glibc-20050110.tar.bz2;
-    md5 = "1171587e4802f43fdda315910adc1854";
+    url = http://ftp.gnu.org/gnu/glibc/glibc-2.3.4.tar.bz2;
+    md5 = "174ac5ed4f2851fcc866a3bac1e4a6a5";
+  };
+
+  linuxthreadsSrc = fetchurl {
+    url = http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.3.4.tar.bz2;
+    md5 = "7a199cd4965eb5622163756ae64358fe";
   };
 
   patches = [ ./glibc-pwd.patch ];