summary refs log tree commit diff
path: root/gnu/packages/zsh.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-03-18 18:11:02 +0100
committerLudovic Courtès <ludo@gnu.org>2015-03-18 18:11:02 +0100
commit381c540b937a5e6e8b7007c9c0271ee816bf5417 (patch)
tree27191f25f05bbfd48dbf47bbd29f72cb7521482f /gnu/packages/zsh.scm
parent49689377a3bab8da08436455ca14a0432fa0e95f (diff)
parentf401b1e9934a6594d6d7586922aa987e0b24839b (diff)
downloadguix-381c540b937a5e6e8b7007c9c0271ee816bf5417.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/zsh.scm')
-rw-r--r--gnu/packages/zsh.scm30
1 files changed, 16 insertions, 14 deletions
diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm
index 9e9ee99cc8..3d3d5889d9 100644
--- a/gnu/packages/zsh.scm
+++ b/gnu/packages/zsh.scm
@@ -41,20 +41,22 @@
                  #:phases (alist-cons-before
                            'configure 'fix-sh
                            (lambda _
-                             (substitute*
-                                 '("configure"
-                                   "configure.ac"
-                                   "Src/exec.c"
-                                   "Src/mkmakemod.sh"
-                                   "Config/installfns.sh"
-                                   "Config/defs.mk.in"
-                                   "Test/E01options.ztst"
-                                   "Test/A05execution.ztst"
-                                   "Test/A01grammar.ztst"
-                                   "Test/B02typeset.ztst"
-                                   "Completion/Unix/Command/_init_d"
-                                   "Util/preconfig")
-                               (("/bin/sh") (which "sh"))))
+                             ;; Some of the files are ISO-8859-1 encoded.
+                             (with-fluids ((%default-port-encoding #f))
+                               (substitute*
+                                   '("configure"
+                                     "configure.ac"
+                                     "Src/exec.c"
+                                     "Src/mkmakemod.sh"
+                                     "Config/installfns.sh"
+                                     "Config/defs.mk.in"
+                                     "Test/E01options.ztst"
+                                     "Test/A05execution.ztst"
+                                     "Test/A01grammar.ztst"
+                                     "Test/B02typeset.ztst"
+                                     "Completion/Unix/Command/_init_d"
+                                     "Util/preconfig")
+                                 (("/bin/sh") (which "sh")))))
                            %standard-phases)))
     (native-inputs `(("autoconf", autoconf)))
     (inputs `(("ncurses", ncurses)