diff options
| author | David Dashyan <mail@davie.li> | 2021-06-23 18:29:59 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-07-13 16:06:56 +0300 |
| commit | 7da8f66e52f7140196680b5ae76682e48fc0a7cc (patch) | |
| tree | 6245384d2eaba42339c8a4a51a864fadbfbcb266 | |
| parent | 7a27129c820a6db3756f5e06bba40d728929b934 (diff) | |
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 <efraim@flashner.co.il>
| -rw-r--r-- | gnu/packages/password-utils.scm | 15 |
1 files changed, 11 insertions, 4 deletions
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 <stefan@xsteve.at> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> +;;; Copyright © 2021 David Dashyan <mail@davie.li> ;;; ;;; 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) |