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

bash-completion: support the "$out/share/bash-completion" location used by modern packages

Browse Source
This commit is contained in:
Peter Simons 2013-04-10 17:35:05 +02:00
parent a215600335
commit e627d309fd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/programs/bash/bash.nix
View File

@ -18,7 +18,7 @@ let
nullglobStatus=$(shopt -p nullglob) nullglobStatus=$(shopt -p nullglob)
shopt -s nullglob shopt -s nullglob
for p in $NIX_PROFILES; do for p in $NIX_PROFILES; do
for m in "$p/etc/bash_completion.d/"*; do for m in "$p/etc/bash_completion.d/"* "$p/share/bash-completion/completions/"*; do
. $m . $m
done done
done done
@ -146,5 +146,8 @@ in
mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh mv /bin/.sh.tmp /bin/sh # atomically replace /bin/sh
''; '';
environment.pathsToLink = optional cfg.enableBashCompletion "/etc/bash_completion.d"; environment.pathsToLink = optionals cfg.enableBashCompletion [
"/etc/bash_completion.d"
"/share/bash-completion"
];
} }