diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-01-23 22:33:10 +0100 |
| commit | 58ea4d407c2e4adbe51b2d7b71dc8bef095677c7 (patch) | |
| tree | 0fd70c0cb82d7980a7ff82500dec7bfd0d535d3f /gnu/packages/gnupg.scm | |
| parent | fcd75bdbfa99d14363b905afbf914eec20e69df8 (diff) | |
| parent | 84b60a7cdfca1421a478894e279104a0c18a7c6d (diff) | |
| download | gnu-guix-58ea4d407c2e4adbe51b2d7b71dc8bef095677c7.tar gnu-guix-58ea4d407c2e4adbe51b2d7b71dc8bef095677c7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 151952663b..051b55f307 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -370,6 +370,15 @@ libskba (working with X.509 certificates and CMS data).") (inputs `(("gnupg" ,gnupg-2.0) ("libassuan" ,libassuan))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-cmake-file + (lambda _ + ;; Work around <https://bugs.gnupg.org/gnupg/issue2877>. + (substitute* "lang/cpp/src/GpgmeppConfig.cmake.in" + (("@libsuffix@") ".so")) + #t))))) (home-page "https://www.gnupg.org/related_software/gpgme/") (synopsis "Library providing simplified access to GnuPG functionality") (description @@ -425,7 +434,8 @@ distributed separately.") ;; Unfortunately, we have to disable some tests due to some gpg-agent ;; goofiness... see: ;; https://bugs.launchpad.net/pygpgme/+bug/999949 - (patches (search-patches "pygpgme-disable-problematic-tests.patch")))) + (patches (search-patches "pygpgme-disable-problematic-tests.patch" + "python-pygpgme-fix-pinentry-tests.patch")))) (arguments `(#:phases (modify-phases %standard-phases |