ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

* Update to bash-4.1-p2 (since we're rebuilding everything anyway).

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19680
This commit is contained in:
Eelco Dolstra 2010-01-26 16:34:50 +00:00
parent 07cdd0fbb1
commit 0d88060fb6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/shells/bash/bash-patches.nix
View File

@ -1,4 +1,6 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56")
(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij")
]

11
pkgs/shells/bash/default.nix
View File

@ -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 {}) )
}