From 0d88060fb65663d2df03f096f3195f716343dd3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jan 2010 16:34:50 +0000
Subject: [PATCH] * Update to bash-4.1-p2 (since we're rebuilding everything
 anyway).

svn path=/nixpkgs/branches/stdenv-updates/; revision=19680
---
 pkgs/shells/bash/bash-patches.nix |  2 ++
 pkgs/shells/bash/default.nix      | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/shells/bash/bash-patches.nix b/pkgs/shells/bash/bash-patches.nix
index b8019fb33502..d22435744ccc 100644
--- a/pkgs/shells/bash/bash-patches.nix
+++ b/pkgs/shells/bash/bash-patches.nix
@@ -1,4 +1,6 @@
 # Automatically generated by `update-patch-set.sh'; do not edit.
 
 patch: [
+(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56")
+(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij")
 ]
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 8e3ce9586720..cb26ce108c4d 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -2,8 +2,8 @@
 
 assert interactive -> readline != null;
 
-stdenv.mkDerivation (rec {
-  name = "bash-4.1";
+stdenv.mkDerivation rec {
+  name = "bash-4.1-p2";
 
   src = fetchurl {
     url = "mirror://gnu/bash/${name}.tar.gz";
@@ -36,8 +36,8 @@ stdenv.mkDerivation (rec {
   buildInputs = stdenv.lib.optional (texinfo != null) texinfo
     ++ stdenv.lib.optional interactive readline;
 
-  configureFlags = "--with-installed-readline";
-
+  configureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
+   
   postInstall = ''
     # Add an `sh' -> `bash' symlink.
     ln -s bash "$out/bin/sh"
@@ -71,5 +71,4 @@ stdenv.mkDerivation (rec {
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
-} // (if stdenv.isDarwin then { configureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; } else {}) )
-
+}