From 3590b859c5e2a8b4fdff3ec06b25cf12e90a49d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 26 Oct 2011 10:48:55 +0000
Subject: [PATCH] Revert stdenv glibc back to version 2.13.

Note that I didn't touch the glibcCross attribute! That still points to glibc 2.14.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30031
---
 pkgs/top-level/all-packages.nix | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 797fcb1dde3..1caf577dec1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3401,7 +3401,9 @@ let
 
   glfw = callPackage ../development/libraries/glfw { };
 
-  glibc = glibc214;
+  glibc = glibc213;
+
+  glibcCross = glibc214Cross;
 
   glibc25 = callPackage ../development/libraries/glibc-2.5 {
     kernelHeaders = linuxHeaders_2_6_28;
@@ -3425,6 +3427,29 @@ let
     installLocales = getConfig [ "glibc" "locales" ] false;
   });
 
+  glibc213 = (callPackage ../development/libraries/glibc-2.13 {
+    kernelHeaders = linuxHeaders;
+    installLocales = getConfig [ "glibc" "locales" ] false;
+    machHeaders = null;
+    hurdHeaders = null;
+    gccCross = null;
+  }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {});
+
+  glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13)
+    (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu");
+     in ({
+       inherit stdenv fetchurl;
+       gccCross = gccCrossStageStatic;
+       kernelHeaders = if crossGNU then hurdHeaders else linuxHeadersCross;
+       installLocales = getConfig [ "glibc" "locales" ] false;
+     }
+
+     //
+
+     (if crossGNU
+      then { inherit machHeaders hurdHeaders mig fetchgit; }
+      else { }))));
+
   glibc214 = (callPackage ../development/libraries/glibc-2.14 {
     kernelHeaders = linuxHeaders;
     installLocales = getConfig [ "glibc" "locales" ] false;
@@ -3448,8 +3473,6 @@ let
       then { inherit machHeaders hurdHeaders mig fetchgit; }
       else { }))));
 
-  glibcCross = glibc214Cross;
-
   # We can choose:
   libcCrossChooser = name : if (name == "glibc") then glibcCross
     else if (name == "uclibc") then uclibcCross