lfam pushed a commit to branch master
in repository guix.
commit ae83dcf6ba9687b7ff123fdd4a81eb952b7b7801
Author: ng0 <[email protected]>
Date: Mon Jul 25 11:47:51 2016 +0000
gnu: gmime: Remove 'gpg' to 'gpg2' substitution.
* gnu/packages/mail.scm (gmime)[arguments]: Remove the substitution which
previously changed 'gpg' to 'gpg2' in 'patch-paths-in-tests' phase.
Signed-off-by: Leo Famulari <[email protected]>
---
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 <[email protected]>
;;; Copyright © 2016 Alex Kost <[email protected]>
;;; Copyright © 2016 Troy Sankey <[email protected]>
+;;; Copyright © 2016 ng0 <[email protected]>
;;;
;;; 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/";)
