diff --git a/pkgs/shells/bash/new.nix b/pkgs/shells/bash/new.nix new file mode 100644 index 00000000000..beaf2f845e7 --- /dev/null +++ b/pkgs/shells/bash/new.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null}: + +assert interactive -> ncurses != null; + +stdenv.mkDerivation { + name = "bash-3.2-p39"; + + src = fetchurl { + url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2; + sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy"; + }; + + NIX_CFLAGS_COMPILE = '' + -DSYS_BASHRC="/etc/bashrc" + -DSYS_BASH_LOGOUT="/etc/bash_logout" + -DDEFAULT_PATH_VALUE="/no-such-path" + -DSTANDARD_UTILS_PATH="/no-such-path" + -DNON_INTERACTIVE_LOGIN_SHELLS + -DSSH_SOURCE_BASHRC + ''; + + postInstall = "ln -s bash $out/bin/sh"; + + patches = [ + # For dietlibc builds. + ./winsize.patch + ]; + + # !!! 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/; + description = + "GNU Bourne-Again Shell, the de facto standard shell on Linux" + + (if interactive then " (for interactive use)" else ""); + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7547e95b1b..5b2a78528f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1207,7 +1207,7 @@ let pkgs = rec { bison = bison23; })); - bashInteractive = appendToName "interactive" (import ../shells/bash { + bashInteractive = appendToName "interactive" (import ../shells/bash/new.nix { inherit fetchurl stdenv ncurses texinfo; bison = bison23; interactive = true;