diff options
| -rw-r--r-- | pkgs/shells/bash/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 3e33292e7428..07d4de24da6f 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, bison, interactive ? false, ncurses ? null}: +{stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null}: assert interactive -> ncurses != null; @@ -17,8 +17,10 @@ stdenv.mkDerivation { ./winsize.patch ]; - # !!! only needed for bash-3.2 (because of bash32-001.patch) - buildInputs = [bison] ++ stdenv.lib.optional interactive ncurses; + # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch) + buildInputs = [bison] + ++ stdenv.lib.optional (texinfo != null) texinfo + ++ stdenv.lib.optional interactive ncurses; meta = { homepage = http://www.gnu.org/software/bash/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f736fdf0b71..d7547e95b1bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1208,7 +1208,7 @@ let pkgs = rec { })); bashInteractive = appendToName "interactive" (import ../shells/bash { - inherit fetchurl stdenv ncurses; + inherit fetchurl stdenv ncurses texinfo; bison = bison23; interactive = true; }); |