diff options
| author | Leo Famulari <leo@famulari.name> | 2016-01-21 02:12:40 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-01-21 18:11:12 -0500 |
| commit | 45da8c6dd10c93280277d17463d09fce6a25afe9 (patch) | |
| tree | deb503ad1dd99e44920227df0c400309cc0d6695 /gnu/packages/zsh.scm | |
| parent | c74f0cb2b871f59466e6fbfbc954d8fc1cbc3c9c (diff) | |
| download | guix-45da8c6dd10c93280277d17463d09fce6a25afe9.tar guix-45da8c6dd10c93280277d17463d09fce6a25afe9.tar.gz | |
gnu: Add iftop.
* gnu/packages/admin.scm (iftop): New variable.
Diffstat (limited to 'gnu/packages/zsh.scm')
| -rw-r--r-- | gnu/packages/zsh.scm | 56 |
1 files changed, 34 insertions, 22 deletions
diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm index 6d25fd4671..2ce36d066b 100644 --- a/gnu/packages/zsh.scm +++ b/gnu/packages/zsh.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages autotools) #:use-module (guix packages) #:use-module (guix download) +; #:use-module (guix build utils) #:use-module (guix build-system gnu) #:use-module (guix licenses)) @@ -42,28 +43,39 @@ (base32 "11shllzhq53fg8ngy3bgbmpf09fn2czifg7hsb41nxi3410mpvcl")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") - #:phases (alist-cons-before - 'configure 'fix-sh - (lambda _ - ;; 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/A06assign.ztst" - "Test/B02typeset.ztst" - "Completion/Unix/Command/_init_d" - "Util/preconfig") - (("/bin/sh") (which "sh"))))) - %standard-phases))) + (arguments `(#:parallel-build? #f + #:configure-flags '("--with-tcsetpgrp" "--enable-pcre") + #:make-flags '("ZTST_verbose=2") + #:phases (modify-phases %standard-phases + (add-before 'configure 'fix-sh + (lambda _ + ;; 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/A06assign.ztst" + "Test/B02typeset.ztst" + "Completion/Unix/Command/_init_d" + "Util/preconfig") + (("/bin/sh") (which "sh")))))) +; (add-before 'check 'provide-zsh-interpreter +; (lambda _ +; (substitute* "Test/runtests.zsh" +; (("#!/bin/zsh -f") +; (string-append "#!" (getcwd) "/Src/zsh -f"))) +; (substitute* "Test/ztst.zsh" +; (("#!/bin/zsh -f") +; (string-append "#!" (getcwd) "/Src/zsh -f"))) +; )) + ))) (native-inputs `(("autoconf", autoconf))) (inputs `(("ncurses", ncurses) ("pcre", pcre) |