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) | |
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 b52edb22546..6288c443add 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm | |||
| @@ -60,10 +60,10 @@ | |||
| 60 | %build-inputs)) | 60 | %build-inputs)) |
| 61 | (let ((install-directory (string-append %output "/share/fonts/mathjax"))) | 61 | (let ((install-directory (string-append %output "/share/fonts/mathjax"))) |
| 62 | (mkdir-p install-directory) | 62 | (mkdir-p install-directory) |
| 63 | (zero? (system* "tar" "-C" install-directory "-xvf" | 63 | (invoke "tar" "-C" install-directory "-xvf" |
| 64 | (assoc-ref %build-inputs "source") | 64 | (assoc-ref %build-inputs "source") |
| 65 | ,(string-append "MathJax-" version "/fonts") | 65 | ,(string-append "MathJax-" version "/fonts") |
| 66 | "--strip" "2")))))) | 66 | "--strip" "2"))))) |
| 67 | (native-inputs | 67 | (native-inputs |
| 68 | `(("gzip" ,gzip) | 68 | `(("gzip" ,gzip) |
| 69 | ("tar" ,tar))) | 69 | ("tar" ,tar))) |
| @@ -94,10 +94,10 @@ | |||
| 94 | (list (assoc-ref %build-inputs "glibc-utf8-locales"))) | 94 | (list (assoc-ref %build-inputs "glibc-utf8-locales"))) |
| 95 | (setenv "LANG" "en_US.UTF-8") | 95 | (setenv "LANG" "en_US.UTF-8") |
| 96 | (let ((install-directory (string-append %output "/share/javascript/mathjax"))) | 96 | (let ((install-directory (string-append %output "/share/javascript/mathjax"))) |
| 97 | (system* "tar" "xvf" (assoc-ref %build-inputs "source") | 97 | (invoke "tar" "xvf" (assoc-ref %build-inputs "source") |
| 98 | ,(string-append "MathJax-" (package-version font-mathjax) | 98 | ,(string-append "MathJax-" (package-version font-mathjax) |
| 99 | "/unpacked") | 99 | "/unpacked") |
| 100 | "--strip" "2") | 100 | "--strip" "2") |
| 101 | (mkdir-p install-directory) | 101 | (mkdir-p install-directory) |
| 102 | (symlink (string-append (assoc-ref %build-inputs "font-mathjax") | 102 | (symlink (string-append (assoc-ref %build-inputs "font-mathjax") |
| 103 | "/share/fonts/mathjax") | 103 | "/share/fonts/mathjax") |
| @@ -118,7 +118,9 @@ | |||
| 118 | (dump-port minified port))))) | 118 | (dump-port minified port))))) |
| 119 | (else | 119 | (else |
| 120 | (install-file file (dirname installed)))))) | 120 | (install-file file (dirname installed)))))) |
| 121 | (find-files ".")))))) | 121 | (find-files ".")) |
| 122 | |||
| 123 | #t)))) | ||
| 122 | (native-inputs | 124 | (native-inputs |
| 123 | `(("font-mathjax" ,font-mathjax) | 125 | `(("font-mathjax" ,font-mathjax) |
| 124 | ("glibc-utf8-locales" ,glibc-utf8-locales) | 126 | ("glibc-utf8-locales" ,glibc-utf8-locales) |
| @@ -159,9 +161,9 @@ be able to view it naturally and easily."))) | |||
| 159 | %build-inputs)) | 161 | %build-inputs)) |
| 160 | (let ((install-directory (string-append %output | 162 | (let ((install-directory (string-append %output |
| 161 | "/share/javascript/respond/"))) | 163 | "/share/javascript/respond/"))) |
| 162 | (system* "tar" "xvf" | 164 | (invoke "tar" "xvf" |
| 163 | (assoc-ref %build-inputs "source") | 165 | (assoc-ref %build-inputs "source") |
| 164 | "--strip" "1") | 166 | "--strip" "1") |
| 165 | (mkdir-p install-directory) | 167 | (mkdir-p install-directory) |
| 166 | (let* ((file "src/respond.js") | 168 | (let* ((file "src/respond.js") |
| 167 | (installed (string-append install-directory "respond.min.js"))) | 169 | (installed (string-append install-directory "respond.min.js"))) |
