diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-09-26 00:15:51 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-26 00:15:51 +0200 |
commit | 834b5c80763eba42018606a674bcc53bfeca10eb (patch) | |
tree | ce2135e354fb318c78339e5849383acc2dde5b69 /gnu | |
parent | 349746dfcd9a07e3b5908d459d0800fd5d44c3b9 (diff) | |
download | patches-834b5c80763eba42018606a674bcc53bfeca10eb.tar patches-834b5c80763eba42018606a674bcc53bfeca10eb.tar.gz |
gnu: zile: Fix references to /bin/sh.
* gnu/packages/zile.scm (zile): Add 'patch-/bin/sh' phase. Move Perl
and help2man to 'native-inputs'.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/zile.scm | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index 6e540ccfab..4907031c89 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,25 +24,37 @@ #:use-module (gnu packages bdw-gc) #:use-module (gnu packages perl) #:use-module (gnu packages help2man) - #:use-module (gnu packages ncurses)) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages bash)) (define-public zile (package (name "zile") (version "2.4.9") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/zile/zile-" - version ".tar.gz")) - (sha256 - (base32 - "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7")))) + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/zile/zile-" + version ".tar.gz")) + (sha256 + (base32 + "0j801c28ypm924rw3lqyb6khxyslg6ycrv16wmmwcam0mk3mj6f7")))) (build-system gnu-build-system) + (arguments + '(#:phases (alist-cons-before + 'configure 'patch-/bin/sh + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + ;; Refer to the actual shell. + (substitute* '("lib/spawni.c" "src/funcs.c") + (("/bin/sh") + (string-append bash "/bin/sh"))))) + %standard-phases))) (inputs `(("boehm-gc" ,libgc) ("ncurses" ,ncurses) - ("perl" ,perl) + ("bash" ,bash))) + (native-inputs + `(("perl" ,perl) ("help2man" ,help2man))) (home-page "http://www.gnu.org/software/zile/") (synopsis "Zile is lossy Emacs, a lightweight Emacs clone") |