summaryrefslogtreecommitdiffstats
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJonas Chevalier <zimbatm@zimbatm.com>2020-11-12 22:22:18 +0100
committerGitHub <noreply@github.com>2020-11-12 21:22:18 +0000
commita7cb88c3def629f4d950d819254c27c1b328b2ac (patch)
treed3dd7ffff60eb64d78eea70761f60830245e979c /pkgs/applications
parent3fceafce1eaa82c36a21153efbf7c1ee87af7b0e (diff)
tree-wide: unify Bash completions outputs (#103421)
Use $out/share/bash-completion/completions to store the Bash completions
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/gammu/bashcomp-dir.patch2
-rw-r--r--pkgs/applications/misc/prevo/tools.nix2
-rw-r--r--pkgs/applications/office/todo.txt-cli/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-bug/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-stree/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/topgit/default.nix4
7 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/applications/misc/gammu/bashcomp-dir.patch
index d41aa432cf35..de402595cd38 100644
--- a/pkgs/applications/misc/gammu/bashcomp-dir.patch
+++ b/pkgs/applications/misc/gammu/bashcomp-dir.patch
@@ -5,7 +5,7 @@
macro_optional_find_package (BashCompletion)
if (NOT BASH_COMPLETION_FOUND)
- set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
-+ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
++ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions" CACHE PATH "Location of bash_completion.d")
endif (NOT BASH_COMPLETION_FOUND)
install (
FILES bash-completion/gammu
diff --git a/pkgs/applications/misc/prevo/tools.nix b/pkgs/applications/misc/prevo/tools.nix
index 6a85e73bf851..39c54b73b2fe 100644
--- a/pkgs/applications/misc/prevo/tools.nix
+++ b/pkgs/applications/misc/prevo/tools.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ glib expat ];
postInstall = ''
- installShellCompletion --bash $out/etc/bash_completion.d/prevo-completion
+ installShellCompletion --bash src/prevo-completion
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index 489b759f48c4..8db5691ed84d 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -13,8 +13,8 @@ in stdenv.mkDerivation {
installPhase = ''
install -vd $out/bin
install -vm 755 todo.sh $out/bin
- install -vd $out/etc/bash_completion.d
- install -vm 644 todo_completion $out/etc/bash_completion.d/todo
+ install -vd $out/share/bash-completion/completions
+ install -vm 644 todo_completion $out/share/bash-completion/completions/todo
install -vd $out/etc/todo
install -vm 644 todo.cfg $out/etc/todo/config
'';
diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
index 44eba8c4b39c..7c345639e9f8 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix
@@ -24,7 +24,7 @@ buildGoModule rec {
'';
postInstall = ''
- install -D -m 0644 misc/bash_completion/git-bug "$out/etc/bash_completion.d/git-bug"
+ install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug"
install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug"
install -D -m 0644 -t "$out/share/man/man1" doc/man/*
'';
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
index dc636571acc0..aa53529933ff 100644
--- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
};
installPhase = ''
- mkdir -p $out/bin $out/etc/bash_completion.d
+ mkdir -p $out/bin $out/share/bash-completion/completions
install -m 0755 git-stree $out/bin/
- install -m 0644 git-stree-completion.bash $out/etc/bash_completion.d/
+ install -m 0644 git-stree-completion.bash $out/share/bash-completion/completions/
'';
meta = with lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index b6efb78513cd..8ab97127294a 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -153,8 +153,8 @@ stdenv.mkDerivation {
cp -a contrib $out/share/git/
mkdir -p $out/share/bash-completion/completions
ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git
- mkdir -p $out/etc/bash_completion.d
- ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/
+ mkdir -p $out/share/bash-completion/completions
+ ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/
# grep is a runtime dependency, need to patch so that it's found
substituteInPlace $out/libexec/git-core/git-sh-setup \
diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
index 0da0cfa02b63..9577b56b6c73 100644
--- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl git ];
postInstall = ''
- install -Dm644 README -t"$out/share/doc/${pname}-${version}/"
- install -Dm755 contrib/tg-completion.bash -t "$out/etc/bash_completion.d/"
+ install -Dm644 README -t "$out/share/doc/${pname}-${version}/"
+ install -Dm755 contrib/tg-completion.bash -t "$out/share/bash-completion/completions/"
'';
meta = with stdenv.lib; {