diff options
| author | Andreas Enge <andreas@enge.fr> | 2016-07-25 21:58:36 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2016-07-25 21:58:36 +0200 |
| commit | 14656f44959a519239910b88b783fa6adbbd8d40 (patch) | |
| tree | 0ece327363bc6ee3d0cacba13c751361091b6ca8 /gnu/packages/gnupg.scm | |
| parent | d8eb912132ccdff955e3318fe549c5f7f674adf8 (diff) | |
| parent | 424a323e92d92284efcd30cf548d1f41c556d592 (diff) | |
| download | guix-14656f44959a519239910b88b783fa6adbbd8d40.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 2b4ce71866..9bc7b65108 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -235,13 +235,14 @@ compatible to GNU Pth.") ("sqlite" ,sqlite) ("zlib" ,zlib))) (arguments - `(#:phases - (alist-cons-before - 'configure 'patch-config-files - (lambda _ - (substitute* "tests/openpgp/defs.inc" - (("/bin/pwd") (which "pwd")))) - %standard-phases))) + `(#:configure-flags '("--enable-gpg2-is-gpg") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-config-files + (lambda _ + (substitute* "tests/openpgp/defs.inc" + (("/bin/pwd") (which "pwd"))) + #t))))) (home-page "https://gnupg.org/") (synopsis "GNU Privacy Guard") (description @@ -280,12 +281,25 @@ libskba (working with X.509 certificates and CMS data).") ("readline" ,readline))) (arguments `(#:phases - (alist-cons-before - 'configure 'patch-config-files - (lambda _ - (substitute* "tests/openpgp/Makefile.in" - (("/bin/sh") (which "bash")))) - %standard-phases))))) + (modify-phases %standard-phases + (add-before 'configure 'patch-config-files + (lambda _ + (substitute* "tests/openpgp/Makefile.in" + (("/bin/sh") (which "bash"))) + #t)) + (add-after 'install 'rename-v2-commands + (lambda* (#:key outputs #:allow-other-keys) + ;; Upstream suggests removing the trailing '2' from command names: + ;; <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22883#58>. + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion (string-append out "/bin") + (rename-file "gpgv2" "gpgv") + (rename-file "gpg2" "gpg") + + ;; Keep the old name around to ease transition. + (symlink "gpgv" "gpgv2") + (symlink "gpg" "gpg2") + #t))))))))) (define-public gnupg-1 (package (inherit gnupg) |