[bug#49188] [PATCH 0/1] Fixing passmenu (password-store) command substitutions

[bug#49188] [PATCH 0/1] Fixing passmenu (password-store) command substitutions

[David Dashyan]

Hello!  There was an update to password-stre contrib scripts adding Wayland
support.  This left some of substite* invocations producing incorrect scripts.

Breackage introduced in upstream commit 
3d36829ce7a203f97e84723e1dc02fef1e0d06cc
link -> https://git.zx2c4.com/password-store/commit/?id=3d36829ce7a203f97e84723e1dc02fef1e0d06cc

But!  I ignored the wailand support -- it requires dmenu-wl and ydotool
packages, I only made the passmenu command work with xorg again.

What do guix do in such case make new output for wayland?

Peace and love

David Dashyan (1):
  gnu: password-store: Fix passmenu paths substitution

 gnu/packages/password-utils.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)


base-commit: d027858e70c4a37aca90b1d4ecb2f0421a95d987
-- 
2.32.0

[bug#49188] [PATCH 1/1] gnu: password-store: Fix passmenu paths substitution

[David Dashyan]

* gnu/packages/password-utils.scm (password-store)
[arguments]: Fix dmenu and xdotool path substitution in patch-passmenu-path
phase.
---
 gnu/packages/password-utils.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 9c8912c5e8..460193c72d 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
+;;; Copyright © 2021 David Dashyan <mail@davie.li>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -517,12 +518,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)
-- 
2.32.0

bug#49188: [PATCH 1/1] gnu: password-store: Fix passmenu paths substitution

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

Thanks. Patch pushed.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]