From 3b69c308566f548cd93599e4c0871912c8e4bc18 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 6 May 2021 12:34:55 +1000 Subject: gnu: xfce4-session: Allow xflock4 to use xset. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- 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 a0dcf79655..704e50e7ed 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -707,7 +707,14 @@ (define-public xfce4-session (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 @@ (define-public xfce4-session ("polkit" ,polkit) ("libsm" ,libsm) ("libwnck" ,libwnck) - ("libxfce4ui" ,libxfce4ui))) + ("libxfce4ui" ,libxfce4ui) + ("xset" ,xset))) (home-page "https://www.xfce.org/") (synopsis "Xfce session manager") (description -- cgit v1.2.3