03/11: gnu: xfce4-session: Allow xflock4 to use xset.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 3b69c308566f548cd93599e4c0871912c8e4bc18
Author: Brendan Tildesley <mail@brendan.scot>
AuthorDate: Thu May 6 12:34:55 2021 +1000

    gnu: xfce4-session: Allow xflock4 to use xset.
    
    * gnu/packages/xfce.scm (xfce4-session):
    [inputs]: Add xset.
    [arguments]: Add 'patch-xflock' phase to use exact store path to 'xset'
    in 'xflock4'.
    
    Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/xfce.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index a0dcf79..704e50e 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -707,7 +707,14 @@ your system in categories, so you can quickly find and 
launch them.")
        (list (string-append "--with-xsession-prefix=" %output))
        ;; Disable icon cache update.
        #:make-flags
-       '("gtk_update_icon_cache=true")))
+       '("gtk_update_icon_cache=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-xflock
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((xset (assoc-ref inputs "xset")))
+               (substitute* "scripts/xflock4"
+                 (("xset") (string-append xset "/bin/xset")))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))
@@ -717,7 +724,8 @@ your system in categories, so you can quickly find and 
launch them.")
        ("polkit" ,polkit)
        ("libsm" ,libsm)
        ("libwnck" ,libwnck)
-       ("libxfce4ui" ,libxfce4ui)))
+       ("libxfce4ui" ,libxfce4ui)
+       ("xset" ,xset)))
     (home-page "https://www.xfce.org/";)
     (synopsis "Xfce session manager")
     (description