diff options
| author | Peter Simons <simons@cryp.to> | 2011-09-24 08:04:47 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-09-24 08:04:47 +0000 |
| commit | 0ad122f4e66c48ef96c73cfd7dfafb40e165c9ed (patch) | |
| tree | 811ba815436d496a3ccbcbfe1722b20356a145ba /pkgs/shells | |
| parent | 01df54f5cc19244915417a606e23d4b0b8c94c06 (diff) | |
| parent | 3e09798bf4693cdda805a029f88423721d82874f (diff) | |
sync with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29468
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 6f39d627bdb95..684fc67ed1a22 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison, bashCompletion ? null}: +{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }: assert interactive -> readline != null; @@ -52,10 +52,7 @@ stdenv.mkDerivation rec { # Add an `sh' -> `bash' symlink. ln -s bash "$out/bin/sh" - '' + (if interactive && bashCompletion != null then '' - ensureDir "$out/etc" - echo >"$out/etc/bash_completion" '. "${bashCompletion}/etc/bash_completion"' - '' else '' + '' + (if interactive then "" else '' # Install the completion examples. ensureDir "$out/etc" cp -v "examples/complete/bash_completion" "$out/etc" |