From 7da8f66e52f7140196680b5ae76682e48fc0a7cc Mon Sep 17 00:00:00 2001 From: David Dashyan Date: Wed, 23 Jun 2021 18:29:59 +0300 Subject: gnu: password-store: Fix passmenu paths substitution. * gnu/packages/password-utils.scm (password-store) [arguments]: Fix dmenu and xdotool path substitution in patch-passmenu-path phase. Signed-off-by: Efraim Flashner --- gnu/packages/password-utils.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0b28a18d95..b969391ba9 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2020 Hartmut Goebel +;;; Copyright © 2021 David Dashyan ;;; ;;; This file is part of GNU Guix. ;;; @@ -518,12 +519,18 @@ any X11 window.") "}\"\n")))) #t)) (add-before 'install 'patch-passmenu-path + ;; FIXME Wayland support requires ydotool and dmenu-wl packages + ;; We are ignoring part of the script that gets executed if + ;; WAYLAND_DISPLAY env variable is set, leaving dmenu-wl and ydotool + ;; commands as is. (lambda* (#:key inputs #:allow-other-keys) (substitute* "contrib/dmenu/passmenu" - (("dmenu") (string-append (assoc-ref inputs "dmenu") - "/bin/dmenu")) - (("xdotool") (string-append (assoc-ref inputs "xdotool") - "/bin/xdotool"))) + (("dmenu=dmenu\n") + (string-append "dmenu=" + (assoc-ref inputs "dmenu") "/bin/dmenu\n")) + (("xdotool=\"xdotool") + (string-append "xdotool=\"" + (assoc-ref inputs "xdotool") "/bin/xdotool"))) #t)) (add-after 'install 'install-passmenu (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3