diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-27 20:14:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-27 21:35:41 -0400 |
| commit | e3cfef22c4a18cacf33356a70788503fd689b96d (patch) | |
| tree | 86549770a7be082dd83e0576511a3607a0b89f31 /gnu/packages/docbook.scm | |
| parent | 6715e1c24f19a5e1eb39c9baae9eebf4238533a7 (diff) | |
| download | guix-e3cfef22c4a18cacf33356a70788503fd689b96d.tar guix-e3cfef22c4a18cacf33356a70788503fd689b96d.tar.gz | |
gnu: Use invoke and return #t from all builders.
* gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/audio.scm,
gnu/packages/avr.scm, gnu/packages/base.scm, gnu/packages/bioinformatics.scm,
gnu/packages/certs.scm, gnu/packages/check.scm, gnu/packages/code.scm,
gnu/packages/commencement.scm, gnu/packages/dictionaries.scm,
gnu/packages/docbook.scm, gnu/packages/emacs.scm, gnu/packages/embedded.scm,
gnu/packages/fonts.scm, gnu/packages/games.scm, gnu/packages/gnome.scm,
gnu/packages/gnu-doc.scm, gnu/packages/guile.scm, gnu/packages/hurd.scm,
gnu/packages/javascript.scm, gnu/packages/libreoffice.scm,
gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lxde.scm,
gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm,
gnu/packages/pkg-config.scm, gnu/packages/qt.scm, gnu/packages/rust.scm,
gnu/packages/scheme.scm, gnu/packages/sdl.scm, gnu/packages/statistics.scm,
gnu/packages/syncthing.scm, gnu/packages/tex.scm, gnu/packages/web.scm,
gnu/packages/wine.scm, gnu/packages/xfce.scm: In the builders of packages
using 'trivial-build-system', use invoke where appropriate, raise exceptions
on errors, and otherwise return #t.
Diffstat (limited to 'gnu/packages/docbook.scm')
| -rw-r--r-- | gnu/packages/docbook.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 3034bc5493..1c00e56d6d 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -58,11 +58,12 @@ (dtd (string-append out "/xml/dtd/docbook"))) (mkdir-p dtd) (with-directory-excursion dtd - (system* unzip source)) + (invoke unzip source)) (substitute* (string-append out "/xml/dtd/docbook/catalog.xml") (("uri=\"") (string-append - "uri=\"file://" dtd "/"))))) + "uri=\"file://" dtd "/"))) + #t)) #:modules ((guix build utils)))) (native-inputs `(("unzip" ,unzip))) (home-page "http://docbook.org") @@ -127,7 +128,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (dtd (string-append (assoc-ref %outputs "out") "/xml/dtd/docbook"))) (mkdir-p dtd) - (zero? (system* unzip source "-d" dtd)))))))) + (invoke unzip source "-d" dtd))))))) (define-public docbook-xsl (package @@ -154,7 +155,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (out (assoc-ref %outputs "out")) (xsl (string-append out "/xml/xsl"))) (setenv "PATH" (string-append bzip2 "/bin" ":" xz "/bin")) - (system* (string-append tar "/bin/tar") "xvf" source) + (invoke (string-append tar "/bin/tar") "xvf" source) (mkdir-p xsl) (copy-recursively name-version @@ -163,8 +164,9 @@ by no means limited to these applications.) This package provides XML DTDs.") (substitute* (string-append xsl "/" name-version "/catalog.xml") (("rewritePrefix=\"./") (string-append "rewritePrefix=\"file://" xsl "/" - name-version "/"))))) - #:modules ((guix build utils)))) + name-version "/"))) + #t)) + #:modules ((guix build utils)))) (native-inputs `(("bzip2" ,bzip2) ("xz" ,xz) ("tar" ,tar))) |