From a9634c0c5a08edb66a68a724d68b5500e7fa72cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jan 2010 10:50:32 +0000
Subject: [PATCH] * The postInstall attribute in default.nix did nothing,
 because   builder.sh already sets postInstall.  As a result Glibc had a  
 retained dependency on bootstrap-tools.  Added the "rm" to   builder.sh. *
 localesbuilder.sh -> locales-builder.sh.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19516
---
 pkgs/development/libraries/glibc-2.11/builder.sh     |  2 ++
 pkgs/development/libraries/glibc-2.11/common.nix     |  4 ++--
 pkgs/development/libraries/glibc-2.11/default.nix    | 12 ++++--------
 .../{localesbuilder.sh => locales-builder.sh}        |  0
 pkgs/development/libraries/glibc-2.11/locales.nix    |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)
 rename pkgs/development/libraries/glibc-2.11/{localesbuilder.sh => locales-builder.sh} (100%)

diff --git a/pkgs/development/libraries/glibc-2.11/builder.sh b/pkgs/development/libraries/glibc-2.11/builder.sh
index fc1ea2f83eb8..57a44bd04ad6 100644
--- a/pkgs/development/libraries/glibc-2.11/builder.sh
+++ b/pkgs/development/libraries/glibc-2.11/builder.sh
@@ -27,6 +27,8 @@ postInstall() {
     if test -n "$is64bit"; then
         ln -s lib $out/lib64
     fi
+
+    rm $out/lib/libgcc_s.so.1
 }
 
 
diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix
index b955bb31a45c..5e0533664c23 100644
--- a/pkgs/development/libraries/glibc-2.11/common.nix
+++ b/pkgs/development/libraries/glibc-2.11/common.nix
@@ -68,11 +68,11 @@ stdenv.mkDerivation ({
     "--enable-kernel=2.6.0"
     "--without-fp"
     "--with-__thread"
-  ] ++ (if (stdenv.system == "armv5tel-linux") then [
+  ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [
     "--host=arm-linux-gnueabi"
     "--build=arm-linux-gnueabi"
     "--without-fp"
-  ] else []);
+  ];
 
   buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ];
 
diff --git a/pkgs/development/libraries/glibc-2.11/default.nix b/pkgs/development/libraries/glibc-2.11/default.nix
index 49ee71af5060..a4ff10509ea7 100644
--- a/pkgs/development/libraries/glibc-2.11/default.nix
+++ b/pkgs/development/libraries/glibc-2.11/default.nix
@@ -21,10 +21,6 @@ in
       ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
     '';
 
-    postInstall = ''
-      rm $out/lib/libgcc_s.so.1
-    '';
-
     meta.description = "The GNU C Library";
   }
 
@@ -36,10 +32,10 @@ in
         sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"
 
         cat > config.cache << "EOF"
-libc_cv_forced_unwind=yes
-libc_cv_c_cleanup=yes
-libc_cv_gnu89_inline=yes
-EOF
+        libc_cv_forced_unwind=yes
+        libc_cv_c_cleanup=yes
+        libc_cv_gnu89_inline=yes
+        EOF
         export BUILD_CC=gcc
         export CC="$crossConfig-gcc"
         export AR="$crossConfig-ar"
diff --git a/pkgs/development/libraries/glibc-2.11/localesbuilder.sh b/pkgs/development/libraries/glibc-2.11/locales-builder.sh
similarity index 100%
rename from pkgs/development/libraries/glibc-2.11/localesbuilder.sh
rename to pkgs/development/libraries/glibc-2.11/locales-builder.sh
diff --git a/pkgs/development/libraries/glibc-2.11/locales.nix b/pkgs/development/libraries/glibc-2.11/locales.nix
index 61bfc9edc02a..821eddd41f0d 100644
--- a/pkgs/development/libraries/glibc-2.11/locales.nix
+++ b/pkgs/development/libraries/glibc-2.11/locales.nix
@@ -16,7 +16,7 @@ in
     inherit fetchurl stdenv;
     installLocales = true;
 
-    builder = ./localesbuilder.sh;
+    builder = ./locales-builder.sh;
 
     # Awful hack: `localedef' doesn't allow the path to `locale-archive'
     # to be overriden, but you *can* specify a prefix, i.e. it will use