guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/08: gnu: wl-clipboard: Fix shell completion directories.


From: guix-commits
Subject: 04/08: gnu: wl-clipboard: Fix shell completion directories.
Date: Sun, 19 Nov 2023 03:50:31 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit c22e027828e7bc75afe6e67b5a328224e16617b4
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Nov 19 10:13:29 2023 +0200

    gnu: wl-clipboard: Fix shell completion directories.
    
    * gnu/packages/xdisorg.scm (wl-clipboard)[arguments]: Adjust
    configure-flags to install fish completions into correct directory.  Add
    a phase to install the bash completions into the correct directory.
    
    Change-Id: If31b477926e3d4c1d8f74e9224af2dea59740f77
---
 gnu/packages/xdisorg.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 553b733a6b..fe70d25e3b 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2773,9 +2773,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$")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]