From: Fredrik Salomonsson <plattfot@posteo.net>
To: 46148@debbugs.gnu.org
Cc: Fredrik Salomonsson <plattfot@posteo.net>
Subject: [bug#46148] [PATCH 1/1] gnu: pinentry-rofi: Update to 2.0.2.
Date: Wed, 27 Jan 2021 18:02:07 -0800 [thread overview]
Message-ID: <20210128020207.149383-1-plattfot@posteo.net> (raw)
In-Reply-To: <20210128015659.148867-1-plattfot@posteo.net>
* gnu/packages/gnupg.scm (pinentry-rofi): Update to 2.0.2.
* gnu/packages/gnupg.scm (pinentry-rofi): Simplify the package definition.
---
gnu/packages/gnupg.scm | 39 ++++++++-------------------------------
1 file changed, 8 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 6e80ca339f..9be8a32540 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -894,7 +894,7 @@ passphrase when @code{gpg} is run and needs it.")))
(define-public pinentry-rofi
(package
(name "pinentry-rofi")
- (version "2.0.1")
+ (version "2.0.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -902,7 +902,7 @@ passphrase when @code{gpg} is run and needs it.")))
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "044bnldz7k74s873jwsjgff176l1jsvpbaka7d1wcj8b5pwqv2av"))))
+ (base32 "14rbz32ykc8pz7gglbvxm3pcgabr7xdnddar6k24icd5xk9mr4rp"))))
(build-system gnu-build-system)
(arguments
`(#:modules
@@ -914,38 +914,15 @@ passphrase when @code{gpg} is run and needs it.")))
%standard-phases
(add-after 'install 'hall-wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((compiled-dir
- (lambda (out version)
- (string-append out "/lib/guile/" version "/site-ccache")))
- (uncompiled-dir
- (lambda (out version)
- (string-append
- out
- "/share/guile/site"
- (if (string-null? version) "" "/")
- version)))
- (dep-path
- (lambda (env path)
- (list env ":" 'prefix (list path))))
- (out (assoc-ref outputs "out"))
+ (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/"))
- (site (uncompiled-dir out "")))
+ (site (string-append out "/share/guile/site"))
+ (rofi-bin (string-append (assoc-ref inputs "rofi") "/bin")))
(match (scandir site)
(("." ".." version)
- (for-each
- (lambda (file)
- (wrap-program
- (string-append bin file)
- (dep-path
- "PATH"
- (string-append (assoc-ref inputs "rofi") "/bin"))
- (dep-path
- "GUILE_LOAD_PATH"
- (uncompiled-dir out version))
- (dep-path
- "GUILE_LOAD_COMPILED_PATH"
- (compiled-dir out version))))
- ,''("pinentry-rofi"))
+ (wrap-program
+ (string-append bin "pinentry-rofi")
+ (list "PATH" ":" 'prefix `(,rofi-bin)))
#t))))))))
(native-inputs
`(("autoconf" ,autoconf)
--
2.30.0
next prev parent reply other threads:[~2021-01-28 2:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 1:56 [bug#46148] [PATCH 0/1] gnu: pinentry-rofi: Update to 2.0.2 Fredrik Salomonsson
2021-01-28 2:02 ` Fredrik Salomonsson [this message]
2021-01-28 13:22 ` bug#46148: [PATCH 1/1] " Nicolas Goaziou
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=20210128020207.149383-1-plattfot@posteo.net \
--to=plattfot@posteo.net \
--cc=46148@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 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).