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

gnu: gpgme: Find the GnuPG executable in the environment. 

This partially reverts commit 0e06bec250 (gnu: gpgme: Build with the
latest GnuPG) because it caused python-pygpgme and python2-pygpgme to
fail to build:

<https://lists.gnu.org/archive/html/guix-devel/2017-12/msg00371.html>

* gnu/packages/gnupg.scm (gpgme)[arguments]: Remove '--enable-fixed-path'
from #:configure-flags.
[inputs]: Move gnupg to native-inputs.
This commit is contained in:
Leo Famulari 2017-12-26 20:51:23 -05:00
parent 684ca67dd9
commit b3ecb3fe8d
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/gnupg.scm
View File

@ -382,18 +382,15 @@ libskba (working with X.509 certificates and CMS data).")
(base32 (base32
"1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v")))) "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
`(("gnupg" ,gnupg)))
(propagated-inputs (propagated-inputs
;; Needs to be propagated because gpgme.h includes gpg-error.h. ;; Needs to be propagated because gpgme.h includes gpg-error.h.
`(("libgpg-error" ,libgpg-error))) `(("libgpg-error" ,libgpg-error)))
(inputs (inputs
`(("gnupg" ,gnupg) `(("libassuan" ,libassuan)))
("libassuan" ,libassuan)))
(arguments (arguments
`(#:configure-flags `(#:phases
(list (string-append "--enable-fixed-path="
(assoc-ref %build-inputs "gnupg")
"/bin"))
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'configure 'patch-cmake-file (add-after 'configure 'patch-cmake-file
(lambda _ (lambda _