public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* bash needs texinfo if you want the manpages / info docs.

Browse Source 
svn path=/nixpkgs/trunk/; revision=12363
This commit is contained in:
Eelco Dolstra 2008-07-16 13:36:41 +00:00
parent 84d3e027b8
commit dd91141a06
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{stdenv, fetchurl, bison, interactive ? false, ncurses ? null}: {stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null}:
assert interactive -> ncurses != null; assert interactive -> ncurses != null;
@ -17,8 +17,10 @@ stdenv.mkDerivation {
./winsize.patch ./winsize.patch
]; ];
# !!! only needed for bash-3.2 (because of bash32-001.patch) # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch)
buildInputs = [bison] ++ stdenv.lib.optional interactive ncurses; buildInputs = [bison]
++ stdenv.lib.optional (texinfo != null) texinfo
++ stdenv.lib.optional interactive ncurses;
meta = { meta = {
homepage = http://www.gnu.org/software/bash/; homepage = http://www.gnu.org/software/bash/;

2
pkgs/top-level/all-packages.nix
View File

@ -1208,7 +1208,7 @@ let pkgs = rec {
})); }));
bashInteractive = appendToName "interactive" (import ../shells/bash { bashInteractive = appendToName "interactive" (import ../shells/bash {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses texinfo;
bison = bison23; bison = bison23;
interactive = true; interactive = true;
}); });