diff options
| author | Peter Simons <simons@cryp.to> | 2011-09-24 08:06:47 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-09-24 08:06:47 +0000 |
| commit | 6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360 (patch) | |
| tree | 0f4926a03d9b3507dc190305b19bc0686c6fcf85 /pkgs/shells/bash/default.nix | |
| parent | 0ad122f4e66c48ef96c73cfd7dfafb40e165c9ed (diff) | |
| download | nixlib-6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360.tar nixlib-6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360.tar.gz nixlib-6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360.tar.bz2 nixlib-6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360.tar.lz nixlib-6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360.tar.xz nixlib-6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360.tar.zst nixlib-6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360.zip | |
pkgs/shells/bash/default.nix: don't install bash completion in non-interactive mode
This patch removes the kludge introduced in trunk to avoid a stdenv rebuild. svn path=/nixpkgs/branches/stdenv-updates/; revision=29469
Diffstat (limited to 'pkgs/shells/bash/default.nix')
| -rw-r--r-- | pkgs/shells/bash/default.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 684fc67ed1a2..529c7334b499 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -51,15 +51,7 @@ stdenv.mkDerivation rec { postInstall = '' # Add an `sh' -> `bash' symlink. ln -s bash "$out/bin/sh" - - '' + (if interactive then "" else '' - # Install the completion examples. - ensureDir "$out/etc" - cp -v "examples/complete/bash_completion" "$out/etc" - - ensureDir "$out/etc/bash_completion.d" - cp -v "examples/complete/complete.gnu-longopt" "$out/etc/bash_completion.d" - ''); + ''; meta = { homepage = http://www.gnu.org/software/bash/; |