diff options
| author | Andreas Enge <andreas@enge.fr> | 2016-07-28 11:08:55 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2016-07-28 11:08:55 +0200 |
| commit | e309c7561043361afe63cc9435e620323f870a61 (patch) | |
| tree | cd6fe073ba840bb68f446933ece44b45d8eb5ec7 /gnu/packages/mail.scm | |
| parent | 1bb163b0dd07c8f2cfd7e91f1e428075cd3d5ed2 (diff) | |
| parent | e335b82c4eba13fe873db2d680d399469931c10f (diff) | |
| download | patches-e309c7561043361afe63cc9435e620323f870a61.tar patches-e309c7561043361afe63cc9435e620323f870a61.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/mail.scm')
| -rw-r--r-- | gnu/packages/mail.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index aed7db0dae..a043baa549 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -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/") |