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

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit b3ecb3fe8d4a947a7807018647616f95532df3ac
Author: Leo Famulari <address@hidden>
Date:   Tue Dec 26 20:51:23 2017 -0500

    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.
---
 gnu/packages/gnupg.scm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 0aa7dad..523c577 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 _