unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: John Kehayias <john.kehayias@protonmail.com>
Cc: "53270@debbugs.gnu.org" <53270-done@debbugs.gnu.org>,
	Maxime Devos <maximedevos@telenet.be>
Subject: bug#53270: [PATCH] gnu: Add yubikey-oath-dmenu.
Date: Mon, 24 Jan 2022 10:10:00 +0100	[thread overview]
Message-ID: <8735ldxzx3.fsf_-_@gnu.org> (raw)
In-Reply-To: <yRBE6e16uCuEAOldGd4aeAX3gbO0Mov_uPv6kc1FWvaGkXEWtwG_orESE6otwe_tm66HusJC9fOe99DGAvbwFIPOJMGvJejPwWt-7Iiq4C4=@protonmail.com> (John Kehayias's message of "Sat, 15 Jan 2022 19:52:50 +0000")

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

Hi,

John Kehayias <john.kehayias@protonmail.com> skribis:

> From a5958b588cebd23012d7d9cbeb8f1e22a3802ea2 Mon Sep 17 00:00:00 2001
> From: John Kehayias <john.kehayias@protonmail.com>
> Date: Fri, 14 Jan 2022 16:11:47 -0500
> Subject: [PATCH] gnu: Add yubikey-oath-dmenu.
>
> * gnu/packages/security-token.scm (yubikey-oath-dmenu): New variable.

Applied.  I took the liberty to make the change below, to avoid using a
non-literal string as the ‘substitute*’ pattern (it’s possible to use a
non-literal string but more error prone).

Thanks John and Maxime!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1243 bytes --]

diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index b2f9f83ba2..8190e1e1e2 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -471,14 +471,12 @@ (define-public yubikey-oath-dmenu
           (delete 'build)     ; or build
           (add-after 'unpack 'fix-paths
             (lambda* (#:key inputs #:allow-other-keys)
-              (for-each (lambda (tool)
-                          (substitute* "yubikey-oath-dmenu.py"
-                            (((string-append "'" tool))
-                             (string-append
-                              "'"
-                              (search-input-file inputs
-                                                 (string-append "/bin/" tool))))))
-                        (list "dmenu" "notify-send" "wl-copy" "xclip" "xdotool"))))
+              (substitute* "yubikey-oath-dmenu.py"
+                (("'(dmenu|notify-send|wl-copy|xclip|xdotool)" _ tool)
+                 (string-append
+                  "'"
+                  (search-input-file inputs
+                                     (string-append "/bin/" tool)))))))
           (replace 'install
             (lambda _
               (invoke "make" "install"

  parent reply	other threads:[~2022-01-24  9:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-14 21:15 [bug#53270] [PATCH] gnu: Add yubikey-oath-dmenu John Kehayias via Guix-patches via
2022-01-14 23:01 ` [bug#53270] [PATCH v2] " John Kehayias via Guix-patches via
2022-01-15 11:27   ` Maxime Devos
2022-01-15 19:52     ` John Kehayias via Guix-patches via
2022-01-24  6:15       ` [bug#53270] [PATCH v3] " John Kehayias via Guix-patches via
2022-01-24  9:10       ` Ludovic Courtès [this message]
2022-01-24 15:46         ` [bug#53270] [PATCH] " John Kehayias via Guix-patches via

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8735ldxzx3.fsf_-_@gnu.org \
    --to=ludo@gnu.org \
    --cc=53270-done@debbugs.gnu.org \
    --cc=john.kehayias@protonmail.com \
    --cc=maximedevos@telenet.be \
    /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 public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).