From ed66cf50a3b9294effc8bbae04b0f2564bd55c10 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Thu, 6 May 2021 12:34:55 +1000 Subject: [PATCH] gnu: xfce4-session: Allow xflock4 to use xset. * gnu/packages/xfce.scm (xfce4-session): [inputs]: Add xset. [arguments]: Add a phase to use exact store path to xset in xflock4. --- gnu/packages/xfce.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 8aa2770ee8..164631cf4d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -707,7 +707,13 @@ 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 _ + (substitute* "scripts/xflock4" + (("xset") (which "xset")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) @@ -717,7 +723,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 -- 2.31.1