diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-26 16:34:50 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-26 16:34:50 +0000 |
| commit | 0d88060fb65663d2df03f096f3195f716343dd3d (patch) | |
| tree | 8e6f3685e9868c34ef0aff45f9620fb42d386533 /pkgs/shells/bash | |
| parent | 07cdd0fbb182915c4a86fa46ede479c4bb55e44b (diff) | |
| download | nixpkgs-0d88060fb65663d2df03f096f3195f716343dd3d.tar nixpkgs-0d88060fb65663d2df03f096f3195f716343dd3d.tar.gz nixpkgs-0d88060fb65663d2df03f096f3195f716343dd3d.tar.bz2 nixpkgs-0d88060fb65663d2df03f096f3195f716343dd3d.tar.lz nixpkgs-0d88060fb65663d2df03f096f3195f716343dd3d.tar.xz nixpkgs-0d88060fb65663d2df03f096f3195f716343dd3d.tar.zst nixpkgs-0d88060fb65663d2df03f096f3195f716343dd3d.zip | |
* Update to bash-4.1-p2 (since we're rebuilding everything anyway).
svn path=/nixpkgs/branches/stdenv-updates/; revision=19680
Diffstat (limited to 'pkgs/shells/bash')
| -rw-r--r-- | pkgs/shells/bash/bash-patches.nix | 2 | ||||
| -rw-r--r-- | 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 b8019fb3350..d22435744cc 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 8e3ce958672..cb26ce108c4 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 {}) ) - +} |