pkgs/shells/bash/default.nix: revert my earlier revision 29244

Including the bash-completion package in bash itself sounded like a good idea
at the time, but it wasn't. After having actually integrated completion support
into NixOS, it has become obvious that this property isn't required at all.
Keeping bash-completion separate from bash works just fine. Anyone who wants
completion support can just install that package.

svn path=/nixpkgs/trunk/; revision=29467

1 files changed, 2 insertions, 5 deletions

diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index e289395bc995..3a0515199b6e 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"