mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 06:31:02 +00:00
bash-completion: support the "$out/share/bash-completion" location used by modern packages
This commit is contained in:
parent
a215600335
commit
e627d309fd
|
@ -18,7 +18,7 @@ let
|
|||
nullglobStatus=$(shopt -p nullglob)
|
||||
shopt -s nullglob
|
||||
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
|
||||
done
|
||||
done
|
||||
|
@ -146,5 +146,8 @@ in
|
|||
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"
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue