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/javascript.scm | |
| parent | 6715e1c24f19a5e1eb39c9baae9eebf4238533a7 (diff) | |
| download | 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/javascript.scm')
| -rw-r--r-- | gnu/packages/javascript.scm | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index b52edb2254..6288c443ad 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -60,10 +60,10 @@ %build-inputs)) (let ((install-directory (string-append %output "/share/fonts/mathjax"))) (mkdir-p install-directory) - (zero? (system* "tar" "-C" install-directory "-xvf" - (assoc-ref %build-inputs "source") - ,(string-append "MathJax-" version "/fonts") - "--strip" "2")))))) + (invoke "tar" "-C" install-directory "-xvf" + (assoc-ref %build-inputs "source") + ,(string-append "MathJax-" version "/fonts") + "--strip" "2"))))) (native-inputs `(("gzip" ,gzip) ("tar" ,tar))) @@ -94,10 +94,10 @@ (list (assoc-ref %build-inputs "glibc-utf8-locales"))) (setenv "LANG" "en_US.UTF-8") (let ((install-directory (string-append %output "/share/javascript/mathjax"))) - (system* "tar" "xvf" (assoc-ref %build-inputs "source") - ,(string-append "MathJax-" (package-version font-mathjax) - "/unpacked") - "--strip" "2") + (invoke "tar" "xvf" (assoc-ref %build-inputs "source") + ,(string-append "MathJax-" (package-version font-mathjax) + "/unpacked") + "--strip" "2") (mkdir-p install-directory) (symlink (string-append (assoc-ref %build-inputs "font-mathjax") "/share/fonts/mathjax") @@ -118,7 +118,9 @@ (dump-port minified port))))) (else (install-file file (dirname installed)))))) - (find-files ".")))))) + (find-files ".")) + + #t)))) (native-inputs `(("font-mathjax" ,font-mathjax) ("glibc-utf8-locales" ,glibc-utf8-locales) @@ -159,9 +161,9 @@ be able to view it naturally and easily."))) %build-inputs)) (let ((install-directory (string-append %output "/share/javascript/respond/"))) - (system* "tar" "xvf" - (assoc-ref %build-inputs "source") - "--strip" "1") + (invoke "tar" "xvf" + (assoc-ref %build-inputs "source") + "--strip" "1") (mkdir-p install-directory) (let* ((file "src/respond.js") (installed (string-append install-directory "respond.min.js"))) |