summaryrefslogtreecommitdiff
path: root/gnu/packages/gnupg.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2017-12-31 14:10:25 +0200
committerEfraim Flashner <efraim@flashner.co.il>2017-12-31 14:10:25 +0200
commit23de2e1d5f8f7548e6f73085de23d9964774edbf (patch)
treefab69d4bb55f275f14012a724b7cb14bd307b57f /gnu/packages/gnupg.scm
parentec6ba5c1fe9308cbc18f06c99adcfe0d13396a18 (diff)
parent1c27f72fc2770d68243dd95b7c05adc3b2b02ea4 (diff)
downloadpatches-23de2e1d5f8f7548e6f73085de23d9964774edbf.tar
patches-23de2e1d5f8f7548e6f73085de23d9964774edbf.tar.gz
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/gnupg.scm')
-rw-r--r--gnu/packages/gnupg.scm14
1 files changed, 6 insertions, 8 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index bb01aac978..880c7ca737 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -369,18 +369,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 _
@@ -419,7 +416,8 @@ and every application benefits from this.")
(chdir "lang/qt")
#t)))))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ,@(package-native-inputs gpgme)))
(inputs
`(("gpgme" ,gpgme)
("qtbase" ,qtbase)