* bash: use the global /etc/bashrc and /etc/bash_logout files.

Changed the built-in default $PATH to /no-such-path.  (This also
  applies to the "standard utilities path" used by "command -p", so
  that doesn't work anymore, but it didn't work anyway on NixOS and
  nobody uses it.)  Include the startup files for non-interactive
  login shells.  Use bashrc when started from ssh.

svn path=/nixpkgs/trunk/; revision=12365
This commit is contained in:
Eelco Dolstra 2008-07-16 15:05:49 +00:00
parent dd91141a06
commit c441868a7e
2 changed files with 41 additions and 1 deletions

40
pkgs/shells/bash/new.nix Normal file
View file

@ -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 "");
};
}

View file

@ -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;