diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-08-24 12:15:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-08-24 23:55:51 +0200 |
| commit | 649c438c2330d1828406235cefb1bec37bc62c86 (patch) | |
| tree | 9cbad1ad6edf57195efea2a53dacbab77abb2296 /gnu | |
| parent | 87f057c46ec77e7e01069f24589f4f665787b331 (diff) | |
gnu: font-mathjax: Move to javascript.scm.
This avoids cross-module top-level references.
* gnu/packages/fonts.scm (font-mathjax): Move to...
* gnu/packages/javascript.scm (font-mathjax): ... here. New variable.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/fonts.scm | 39 | ||||
| -rw-r--r-- | gnu/packages/javascript.scm | 40 |
2 files changed, 39 insertions, 40 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 051926cbd73..69ef743cba6 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm | |||
| @@ -1013,45 +1013,6 @@ have been optimized for beautiful display on all common platforms and display | |||
| 1013 | resolutions.") | 1013 | resolutions.") |
| 1014 | (license license:asl2.0))) | 1014 | (license license:asl2.0))) |
| 1015 | 1015 | ||
| 1016 | (define-public font-mathjax | ||
| 1017 | (package | ||
| 1018 | (name "font-mathjax") | ||
| 1019 | (version "2.7.1") | ||
| 1020 | (source | ||
| 1021 | (origin | ||
| 1022 | (method url-fetch) | ||
| 1023 | (uri (string-append | ||
| 1024 | "https://github.com/mathjax/MathJax/archive/" | ||
| 1025 | version ".tar.gz")) | ||
| 1026 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 1027 | (sha256 | ||
| 1028 | (base32 | ||
| 1029 | "0sbib5lk0jrvbq6s72ag6ss3wjlz5wnk07ddxij1kp96yg3c1d1b")))) | ||
| 1030 | (build-system trivial-build-system) | ||
| 1031 | (arguments | ||
| 1032 | `(#:modules ((guix build utils)) | ||
| 1033 | #:builder | ||
| 1034 | (begin | ||
| 1035 | (use-modules (guix build utils) | ||
| 1036 | (ice-9 match)) | ||
| 1037 | (set-path-environment-variable | ||
| 1038 | "PATH" '("bin") (map (match-lambda | ||
| 1039 | ((_ . input) | ||
| 1040 | input)) | ||
| 1041 | %build-inputs)) | ||
| 1042 | (let ((install-directory (string-append %output "/share/fonts/mathjax"))) | ||
| 1043 | (mkdir-p install-directory) | ||
| 1044 | (zero? (system* "tar" "-C" install-directory "-xvf" | ||
| 1045 | (assoc-ref %build-inputs "source") | ||
| 1046 | "MathJax-2.7.1/fonts" "--strip" "2")))))) | ||
| 1047 | (native-inputs | ||
| 1048 | `(("gzip" ,gzip) | ||
| 1049 | ("tar" ,tar))) | ||
| 1050 | (home-page "https://www.mathjax.org/") | ||
| 1051 | (synopsis "Fonts for MathJax") | ||
| 1052 | (description "This package contains the fonts required for MathJax.") | ||
| 1053 | (license license:asl2.0))) | ||
| 1054 | |||
| 1055 | (define-public font-open-dyslexic | 1016 | (define-public font-open-dyslexic |
| 1056 | (package | 1017 | (package |
| 1057 | (name "font-open-dyslexic") | 1018 | (name "font-open-dyslexic") |
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 12f12bf8f13..85017453ffb 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #:use-module (gnu packages) | 22 | #:use-module (gnu packages) |
| 23 | #:use-module (gnu packages base) | 23 | #:use-module (gnu packages base) |
| 24 | #:use-module (gnu packages compression) | 24 | #:use-module (gnu packages compression) |
| 25 | #:use-module (gnu packages fonts) | ||
| 26 | #:use-module (gnu packages lisp) | 25 | #:use-module (gnu packages lisp) |
| 27 | #:use-module (guix packages) | 26 | #:use-module (guix packages) |
| 28 | #:use-module (guix download) | 27 | #:use-module (guix download) |
| @@ -30,6 +29,45 @@ | |||
| 30 | #:use-module (guix build-system trivial) | 29 | #:use-module (guix build-system trivial) |
| 31 | #:use-module (guix build-system minify)) | 30 | #:use-module (guix build-system minify)) |
| 32 | 31 | ||
| 32 | (define-public font-mathjax | ||
| 33 | (package | ||
| 34 | (name "font-mathjax") | ||
| 35 | (version "2.7.1") | ||
| 36 | (source | ||
| 37 | (origin | ||
| 38 | (method url-fetch) | ||
| 39 | (uri (string-append | ||
| 40 | "https://github.com/mathjax/MathJax/archive/" | ||
| 41 | version ".tar.gz")) | ||
| 42 | (file-name (string-append name "-" version ".tar.gz")) | ||
| 43 | (sha256 | ||
| 44 | (base32 | ||
| 45 | "0sbib5lk0jrvbq6s72ag6ss3wjlz5wnk07ddxij1kp96yg3c1d1b")))) | ||
| 46 | (build-system trivial-build-system) | ||
| 47 | (arguments | ||
| 48 | `(#:modules ((guix build utils)) | ||
| 49 | #:builder | ||
| 50 | (begin | ||
| 51 | (use-modules (guix build utils) | ||
| 52 | (ice-9 match)) | ||
| 53 | (set-path-environment-variable | ||
| 54 | "PATH" '("bin") (map (match-lambda | ||
| 55 | ((_ . input) | ||
| 56 | input)) | ||
| 57 | %build-inputs)) | ||
| 58 | (let ((install-directory (string-append %output "/share/fonts/mathjax"))) | ||
| 59 | (mkdir-p install-directory) | ||
| 60 | (zero? (system* "tar" "-C" install-directory "-xvf" | ||
| 61 | (assoc-ref %build-inputs "source") | ||
| 62 | "MathJax-2.7.1/fonts" "--strip" "2")))))) | ||
| 63 | (native-inputs | ||
| 64 | `(("gzip" ,gzip) | ||
| 65 | ("tar" ,tar))) | ||
| 66 | (home-page "https://www.mathjax.org/") | ||
| 67 | (synopsis "Fonts for MathJax") | ||
| 68 | (description "This package contains the fonts required for MathJax.") | ||
| 69 | (license license:asl2.0))) | ||
| 70 | |||
| 33 | (define-public js-mathjax | 71 | (define-public js-mathjax |
| 34 | (package | 72 | (package |
| 35 | (inherit font-mathjax) | 73 | (inherit font-mathjax) |
