From 6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Sep 2011 08:06:47 +0000 Subject: [PATCH] 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 --- pkgs/shells/bash/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 684fc67ed1a..529c7334b49 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/;