guix-commits
[Top][All Lists]
Advanced

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

branch core-updates updated: gnu: packagekit: Fix installation directory


From: guix-commits
Subject: branch core-updates updated: gnu: packagekit: Fix installation directory for bash completions.
Date: Sat, 18 Mar 2023 13:57:27 -0400

This is an automated email from the git hooks/post-receive script.

andreas pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new edd0ec7c2f gnu: packagekit: Fix installation directory for bash 
completions.
edd0ec7c2f is described below

commit edd0ec7c2fe5d79964b6225b882f5143f668ca8d
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Fri Mar 17 23:57:22 2023 +0100

    gnu: packagekit: Fix installation directory for bash completions.
    
    Without this patch, packagekit would attempt to install bash completions
    to another store directory, invoking pkexec in the process and raising
    a cryptic error.
    
    * gnu/packages/freedesktop.scm (packagekit)[#:phases]: Add
    ‘fix-bash-completion-dir’.
    
    Co-authored-by: Andreas Enge <andreas@enge.fr>
    Signed-off-by: Andreas Enge <andreas@enge.fr>
---
 gnu/packages/freedesktop.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 9ba53cd044..d446da9a5d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1002,7 +1002,14 @@ with localed.  This package is extracted from the 
broader systemd package.")
                                   ".tar.xz"))
               (sha256
                (base32
-                "09md23m4fw87x264mls1f5isrswk6iw7y9g4hr1nib008wbbk370"))))
+                "09md23m4fw87x264mls1f5isrswk6iw7y9g4hr1nib008wbbk370"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (substitute* "contrib/meson.build"
+                    (("bash_.*_dep\\.get_.*\\('completionsdir', .*\\)")
+                     "join_paths(get_option('prefix'), 'share',
+                                 'bash-completion', 'completions')"))))))
     (build-system meson-build-system)
     (arguments
      (list #:tests? #f



reply via email to

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