summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-08-24 12:15:08 +0200
committerLudovic Courtès <ludo@gnu.org>2017-08-24 23:55:51 +0200
commit649c438c2330d1828406235cefb1bec37bc62c86 (patch)
tree9cbad1ad6edf57195efea2a53dacbab77abb2296
parent87f057c46ec77e7e01069f24589f4f665787b331 (diff)
downloadpatches-649c438c2330d1828406235cefb1bec37bc62c86.tar
patches-649c438c2330d1828406235cefb1bec37bc62c86.tar.gz
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.
-rw-r--r--gnu/packages/fonts.scm39
-rw-r--r--gnu/packages/javascript.scm40
2 files changed, 39 insertions, 40 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 051926cbd7..69ef743cba 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
resolutions.")
(license license:asl2.0)))
-(define-public font-mathjax
- (package
- (name "font-mathjax")
- (version "2.7.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/mathjax/MathJax/archive/"
- version ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "0sbib5lk0jrvbq6s72ag6ss3wjlz5wnk07ddxij1kp96yg3c1d1b"))))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils)
- (ice-9 match))
- (set-path-environment-variable
- "PATH" '("bin") (map (match-lambda
- ((_ . input)
- input))
- %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")
- "MathJax-2.7.1/fonts" "--strip" "2"))))))
- (native-inputs
- `(("gzip" ,gzip)
- ("tar" ,tar)))
- (home-page "https://www.mathjax.org/")
- (synopsis "Fonts for MathJax")
- (description "This package contains the fonts required for MathJax.")
- (license license:asl2.0)))
-
(define-public font-open-dyslexic
(package
(name "font-open-dyslexic")
diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index 12f12bf8f1..85017453ff 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -22,7 +22,6 @@
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
- #:use-module (gnu packages fonts)
#:use-module (gnu packages lisp)
#:use-module (guix packages)
#:use-module (guix download)
@@ -30,6 +29,45 @@
#:use-module (guix build-system trivial)
#:use-module (guix build-system minify))
+(define-public font-mathjax
+ (package
+ (name "font-mathjax")
+ (version "2.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/mathjax/MathJax/archive/"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0sbib5lk0jrvbq6s72ag6ss3wjlz5wnk07ddxij1kp96yg3c1d1b"))))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils)
+ (ice-9 match))
+ (set-path-environment-variable
+ "PATH" '("bin") (map (match-lambda
+ ((_ . input)
+ input))
+ %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")
+ "MathJax-2.7.1/fonts" "--strip" "2"))))))
+ (native-inputs
+ `(("gzip" ,gzip)
+ ("tar" ,tar)))
+ (home-page "https://www.mathjax.org/")
+ (synopsis "Fonts for MathJax")
+ (description "This package contains the fonts required for MathJax.")
+ (license license:asl2.0)))
+
(define-public js-mathjax
(package
(inherit font-mathjax)