JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Peter Simons 2011-09-24 07:58:19 +00:00
parent 0a5f021abd
commit 3e09798bf4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/shells/bash/default.nix
View File

@ -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; assert interactive -> readline != null;
@ -52,10 +52,7 @@ stdenv.mkDerivation rec {
# Add an `sh' -> `bash' symlink. # Add an `sh' -> `bash' symlink.
ln -s bash "$out/bin/sh" ln -s bash "$out/bin/sh"
'' + (if interactive && bashCompletion != null then '' '' + (if interactive then "" else ''
ensureDir "$out/etc"
echo >"$out/etc/bash_completion" '. "${bashCompletion}/etc/bash_completion"'
'' else ''
# Install the completion examples. # Install the completion examples.
ensureDir "$out/etc" ensureDir "$out/etc"
cp -v "examples/complete/bash_completion" "$out/etc" cp -v "examples/complete/bash_completion" "$out/etc"