guix-commits
[Top][All Lists]
Advanced

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

03/05: gnu: cups-pk-helper: Add etc/dbus-1 compatibility symlink.


From: guix-commits
Subject: 03/05: gnu: cups-pk-helper: Add etc/dbus-1 compatibility symlink.
Date: Sat, 13 Aug 2022 18:02:33 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit e315d9a8024e8964f6bd066b4a2ac8d626754e80
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Aug 7 02:00:01 2022 +0200

    gnu: cups-pk-helper: Add etc/dbus-1 compatibility symlink.
    
    * gnu/packages/cups.scm (cups-pk-helper)[arguments]:
    Add an 'install-compatibility-symlink phase.
---
 gnu/packages/cups.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 5070ab6693..3de9ddbf22 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -477,9 +477,20 @@ device-specific programs to convert and print many types 
of files.")
     (build-system meson-build-system)
     (arguments
      ;; XXX The tests require a running D-Bus and CUPS daemon, of course.
-     (list #:tests? #f))
+     (list #:tests? #f
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-compatibility-symlink
+                 ;; XXX Upstream (and, presumably, the world) has moved to
+                 ;; /share/dbus-1 over /etc/dbus-1, but Guix System's
+                 ;; dbus-configuration-directory has yet to catch up.
+                 ;; TODO It should be properly fixed and this phase removed.
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (with-directory-excursion (assoc-ref outputs "out")
+                     (mkdir-p "etc")
+                     (symlink "../share/dbus-1" "etc/dbus-1")))))))
     (native-inputs
-     (list pkg-config `(,glib "bin")))
+     (list intltool pkg-config `(,glib "bin")))
     (inputs
      (list glib polkit cups-minimal))
     (home-page "https://www.freedesktop.org/wiki/Software/cups-pk-helper/";)



reply via email to

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