From: David Dashyan <mail@davie.li>
To: 49188@debbugs.gnu.org
Cc: David Dashyan <mail@davie.li>
Subject: [bug#49188] [PATCH 1/1] gnu: password-store: Fix passmenu paths substitution
Date: Wed, 23 Jun 2021 18:29:59 +0300 [thread overview]
Message-ID: <20210623152959.31046-1-mail@davie.li> (raw)
In-Reply-To: <20210623152644.30909-1-mail@davie.li>
* 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
next prev parent reply other threads:[~2021-06-23 15:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 15:26 [bug#49188] [PATCH 0/1] Fixing passmenu (password-store) command substitutions David Dashyan
2021-06-23 15:29 ` David Dashyan [this message]
2021-07-13 13:08 ` bug#49188: [PATCH 1/1] gnu: password-store: Fix passmenu paths substitution Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210623152959.31046-1-mail@davie.li \
--to=mail@davie.li \
--cc=49188@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.