From 9eed6f9b88ed589d7531e2d5cecc73fd095db523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 25 Aug 2013 16:47:20 +0200 Subject: [PATCH] gnu: pius: Use the right `gpg' binary. * gnu/packages/gnupg.scm (pius): Add GnuPG as an input. Patch the installed binaries to refer to the right GnuPG executable. Fix synopsis. --- gnu/packages/gnupg.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index b3b6dc92ab115100bc9da891b6f45272a0aadfeb..604ebc2941fa5d526c8d7f0f008396c5c0f638b3 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -191,7 +191,8 @@ S/MIME.") "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d")))) (build-system gnu-build-system) (inputs `(("perl" ,perl) - ("python" ,python))) + ("python" ,python) + ("gpg" ,gnupg))) (arguments `(#:tests? #f #:phases @@ -203,16 +204,19 @@ S/MIME.") (lambda* (#:key #:allow-other-keys) #t) (alist-replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (gpg (string-append (assoc-ref inputs "gpg") + "/bin/gpg2"))) (mkdir out) (mkdir (string-append out "/bin")) - (for-each - (lambda (filename) - (copy-file filename (string-append out "/bin/" filename))) - '("pius" "pius-keyring-mgr" "pius-party-worksheet")))) + (for-each (lambda (file) + (substitute* file + (("/usr/bin/gpg") gpg)) + (copy-file file (string-append out "/bin/" file))) + '("pius" "pius-keyring-mgr" "pius-party-worksheet")))) %standard-phases))))) - (synopsis "programs to simplify gnupg key signing") + (synopsis "Programs to simplify GnuPG key signing") (description "Pius (PGP Individual UID Signer) helps attendees of PGP keysigning parties. It is the main utility and makes it possible to quickly and easily