gmime building broke with gpg@2.1 --build-gpg2-as-gpg or what it was. This fixes it. Please also fix the typo in the commit message ("peviously"). From 3bc7d2c8d94da0a81ecc16b2e12791f9ed466c95 Mon Sep 17 00:00:00 2001 From: ng0 Date: Mon, 25 Jul 2016 11:38:37 +0000 Subject: [PATCH] gnu: gmime: Remove gpg to gpg2 patch. * gnu/packages/mail.scm (gmime)[arguments]: Remove the patch which peviously changed gpg to gpg2 in 'patch-paths-in-tests phase. --- gnu/packages/mail.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 9214b73..f7a7623 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 Troy Sankey +;;; Copyright © 2016 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -240,14 +241,14 @@ operating systems.") 'unpack 'patch-paths-in-tests (lambda _ ;; The test programs run several programs using 'system' with - ;; hard-coded paths. Here we patch them all. We also change "gpg" - ;; to "gpg2". We use ISO-8859-1 here because test-iconv.c contains + ;; hard-coded paths. Here we patch them all. + ;; We use ISO-8859-1 here because test-iconv.c contains ;; raw byte sequences in several different encodings. (with-fluids ((%default-port-encoding #f)) (substitute* (find-files "tests" "\\.c$") (("(system *\\(\")(/[^ ]*)" all pre prog-path) (let* ((base (basename prog-path)) - (prog (which (if (string=? base "gpg") "gpg2" base)))) + (prog (which base))) (string-append pre (or prog (error "not found: " base)))))))))))) (home-page "http://spruce.sourceforge.net/gmime/") -- 2.9.1 -- ♥Ⓐ ng0 Current Keys: https://we.make.ritual.n0.is/ng0.txt For non-prism friendly talk find me on http://www.psyced.org