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 <leo@famulari.name>
master
ng0 2016-07-25 11:47:51 +00:00 committed by Leo Famulari
parent d3896fc4ce
commit ae83dcf6ba
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 4 additions and 3 deletions

View File

@ -15,6 +15,7 @@
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;;
;;; 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/")