nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: pius: Adjust to the new libpius. 

Prior to this commit the libpius modules would not be found and the default
GnuPG file name would be /usr/bin/gpg.

* gnu/packages/gnupg.scm (pius)[inputs]: Remove PYTHON-2.
  [build-system]: Switch to PYTHON-BUILD-SYSTEM.
  [arguments]: Add #:python.  Change to add a single phase,
  'set-gpg-file-name'.
This commit is contained in:
Ludovic Courtès 2015-08-26 00:41:07 +02:00
parent fe32241ad5
commit 14e2e44d44
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/gnupg.scm
View File

@ -36,7 +36,8 @@
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu)) #:use-module (guix build-system gnu)
#:use-module (guix build-system python))
(define-public libgpg-error (define-public libgpg-error
(package (package
@ -335,31 +336,21 @@ and every application benefits from this.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (base32 (sha256 (base32
"0ry3kc3x1qjmvb581ja2z2v32r1rl1g8rhfj7iqvs8nzq4ca512i")))) "0ry3kc3x1qjmvb581ja2z2v32r1rl1g8rhfj7iqvs8nzq4ca512i"))))
(build-system gnu-build-system) (build-system python-build-system)
(inputs `(("perl" ,perl) (inputs `(("perl" ,perl) ;for 'pius-party-worksheet'
("python" ,python-2) ;uses the Python 2 'print' syntax
("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent 2.0 ("gpg" ,gnupg-2.0))) ;2.1 fails to talk to gpg-agent 2.0
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:python ,python-2 ;uses the Python 2 'print' syntax
#:phases #:phases
(alist-delete (modify-phases %standard-phases
'configure (add-before
(alist-delete 'build 'set-gpg-file-name
'build (lambda* (#:key inputs outputs #:allow-other-keys)
(alist-replace (let* ((gpg (string-append (assoc-ref inputs "gpg")
'install "/bin/gpg2")))
(lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "libpius/constants.py"
(let* ((out (assoc-ref outputs "out")) (("/usr/bin/gpg") gpg))))))))
(gpg (string-append (assoc-ref inputs "gpg")
"/bin/gpg2")))
(mkdir out)
(mkdir (string-append out "/bin"))
(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 (description
"Pius (PGP Individual UID Signer) helps attendees of PGP keysigning "Pius (PGP Individual UID Signer) helps attendees of PGP keysigning