From cfab5a8cf9789c373354af36e65566212f3a739d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Aug 2007 19:04:19 +0000
Subject: [PATCH] Now glibc-NPTL builds...

svn path=/nixpkgs/trunk/; revision=9162
---
 .../development/libraries/glibc-nptl/default.nix | 16 ++++++++++------
 pkgs/top-level/all-packages.nix                  |  3 ++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/glibc-nptl/default.nix b/pkgs/development/libraries/glibc-nptl/default.nix
index 7616c07a492..86cc9ecf565 100644
--- a/pkgs/development/libraries/glibc-nptl/default.nix
+++ b/pkgs/development/libraries/glibc-nptl/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, kernelHeaders
+{ stdenv, fetchurl, kernelHeaders 
+,perl
 , installLocales ? true
 , profilingLibraries ? false
 }:
 
 stdenv.mkDerivation {
-  name = "glibc-2.5-nptl";
+  name = "glibc-2.6.1-nptl";
   builder = ./builder.sh;
 
-  src = fetchurl {
-    url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2;
-    md5 = "1fb29764a6a650a4d5b409dda227ac9f";
-  };
+  src = 
+	fetchurl {
+		url = http://ftp.gnu.org/gnu/glibc/glibc-2.6.1.tar.bz2;
+		sha256 = "08pcfsi9zpikjakljklks2ln3hn7544cr9br4kbh5kx27cy3mv9x";
+	};
 
   patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ];
 
@@ -18,6 +20,8 @@ stdenv.mkDerivation {
 
   inherit (stdenv) is64bit;
 
+  buildInputs=[perl];
+
   # `--with-tls --without-__thread' enables support for TLS but causes
   # it not to be used.  Required if we don't want to barf on 2.4
   # kernels.  Or something.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e0bef99f86..d5e7160a81b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1421,7 +1421,8 @@ rec {
     });
 
   glibcNPTL = import ../development/libraries/glibc-nptl {
-    inherit stdenv fetchurl kernelHeaders; 
+    inherit fetchurl kernelHeaders perl; 
+    stdenv = overrideGCC stdenv gcc34;
   };
 
   glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {