aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/xdisorg.scm
diff options
context:
space:
mode:
authorJohn Kehayias <john.kehayias@protonmail.com>2023-11-21 18:11:10 -0500
committerJohn Kehayias <john.kehayias@protonmail.com>2023-11-21 18:11:30 -0500
commit8d2a5a36af4c36dfa08c7ee75d7a06ebb7a8225a (patch)
tree0e0f0cc9d5fa5a3c783451d12b10ebdb4c0aafe9 /gnu/packages/xdisorg.scm
parentd1b786fe629ae9a80f37f64fdf48b9d7c132cd11 (diff)
parent42be8fa560a7554ac35801b46c3a0a007fd742ce (diff)
downloadguix-8d2a5a36af4c36dfa08c7ee75d7a06ebb7a8225a.tar
guix-8d2a5a36af4c36dfa08c7ee75d7a06ebb7a8225a.tar.gz
Merge branch 'master' into mesa-updates
Change-Id: I94c6874e5fdf916e3eb911f1a7df610cd3275474
Diffstat (limited to 'gnu/packages/xdisorg.scm')
-rw-r--r--gnu/packages/xdisorg.scm9
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 9de5cd24d2..f9bf42b721 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2796,9 +2796,16 @@ Wayland and @code{wlroots} by leveraging @command{grim} and @command{slurp}.")
#~(list (string-append "-Dzshcompletiondir=" #$output
"/share/zsh/site-functions")
(string-append "-Dfishcompletiondir=" #$output
- "/share/fish/completions"))
+ "/share/fish/vendor_completions.d"))
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-bash-completion-dir
+ (lambda _
+ (substitute* "completions/bash/meson.build"
+ (("bash_completion_dir =.*")
+ (string-append "bash_completion_dir = "
+ "join_paths(get_option('sysconfdir'), "
+ "'bash_completion.d')\n")))))
(add-after 'unpack 'patch-file-names
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "src" "\\.c$")