~ruther/guix-local

649c438c2330d1828406235cefb1bec37bc62c86 — Ludovic Courtès 8 years ago 87f057c
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.
2 files changed, 39 insertions(+), 40 deletions(-)

M gnu/packages/fonts.scm
M gnu/packages/javascript.scm
M gnu/packages/fonts.scm => gnu/packages/fonts.scm +0 -39
@@ 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")

M gnu/packages/javascript.scm => gnu/packages/javascript.scm +39 -1
@@ 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)