diff options
| author | Leo Famulari <leo@famulari.name> | 2017-12-26 20:51:23 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-12-26 21:12:27 -0500 |
| commit | b3ecb3fe8d4a947a7807018647616f95532df3ac (patch) | |
| tree | 68e73ca2003a1608627d2c6931896d1cdc1b9311 | |
| parent | 684ca67dd9bdc368581976d18bdc8ba5c8fa072d (diff) | |
| download | guix-b3ecb3fe8d4a947a7807018647616f95532df3ac.tar.gz | |
gnu: gpgme: Find the GnuPG executable in the environment.
This partially reverts commit 0e06bec250f34d (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.
| -rw-r--r-- | gnu/packages/gnupg.scm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 0aa7dad0fa..523c577a01 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -382,18 +382,15 @@ libskba (working with X.509 certificates and CMS data).") (base32 "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v")))) (build-system gnu-build-system) + (native-inputs + `(("gnupg" ,gnupg))) (propagated-inputs ;; Needs to be propagated because gpgme.h includes gpg-error.h. `(("libgpg-error" ,libgpg-error))) (inputs - `(("gnupg" ,gnupg) - ("libassuan" ,libassuan))) + `(("libassuan" ,libassuan))) (arguments - `(#:configure-flags - (list (string-append "--enable-fixed-path=" - (assoc-ref %build-inputs "gnupg") - "/bin")) - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'configure 'patch-cmake-file (lambda _ |