[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: zsh: Use ISO-8859-1 in 'fix-sh' phase.
From: |
Mark H. Weaver |
Subject: |
01/01: gnu: zsh: Use ISO-8859-1 in 'fix-sh' phase. |
Date: |
Sat, 07 Mar 2015 07:42:50 +0000 |
mhw pushed a commit to branch master
in repository guix.
commit 526d71b3033217332edb5076833e662ab92e0ad9
Author: Mark H Weaver <address@hidden>
Date: Sat Mar 7 02:40:55 2015 -0500
gnu: zsh: Use ISO-8859-1 in 'fix-sh' phase.
* gnu/packages/zsh.scm (zsh)[arguments]: Use ISO-8859-1 in 'fix-sh' phase.
---
gnu/packages/zsh.scm | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm
index 9e9ee99..3d3d588 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)