Subject: Re: bug#53270: [PATCH] gnu: Add yubikey-oath-dmenu.
From: Ludovic Courtès <[email-masked]>
To: John Kehayias <[email-masked]>
Cc: "[email-masked]" <[email-masked]>, Maxime Devos <[email-masked]>
Date: Mon, 24 Jan 2022 10:10:00 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

John Kehayias <[email-masked]> skribis:

> From a5958b588cebd23012d7d9cbeb8f1e22a3802ea2 Mon Sep 17 00:00:00 2001
> From: John Kehayias <[email-masked]>
> 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’.

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"