Message ID | 8735ldxzx3.fsf_-_@gnu.org |
---|---|
State | Accepted |
Headers | show |
Series | bug#53270: [PATCH] gnu: Add yubikey-oath-dmenu. | expand |
Context | Check | Description |
---|---|---|
cbaines/applying patch | fail | View Laminar job |
Hi, ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ On Monday, January 24th, 2022 at 4:10 AM, Ludovic Courtès wrote: > > 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! > Ah, that's how you do that, I'll add that to my virtual packaging toolbox. Thanks for pushing and thanks for the review Maxime! John
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"