guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: font-mathjax, js-mathjax: Remove hard-coded version.


From: Tobias Geerinckx-Rice
Subject: 03/04: gnu: font-mathjax, js-mathjax: Remove hard-coded version.
Date: Tue, 29 Aug 2017 17:38:35 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 77217b43935e5686a48d8a4676345efc3081fbdf
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Tue Aug 29 21:36:13 2017 +0200

    gnu: font-mathjax, js-mathjax: Remove hard-coded version.
    
    * gnu/package-s/javascript.scm (font-mathjax, js-mathjax)[arguments]: Re-use
    font-mathjax's ‘version’ field instead of duplicating the version number.
---
 gnu/packages/javascript.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm
index a723b9e..2d1f6ac 100644
--- a/gnu/packages/javascript.scm
+++ b/gnu/packages/javascript.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Arun Isaac <address@hidden>
 ;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -59,7 +60,8 @@
            (mkdir-p install-directory)
            (zero? (system* "tar" "-C" install-directory "-xvf"
                            (assoc-ref %build-inputs "source")
-                           "MathJax-2.7.2/fonts" "--strip" "2"))))))
+                           ,(string-append "MathJax-" version "/fonts")
+                           "--strip" "2"))))))
     (native-inputs
      `(("gzip" ,gzip)
        ("tar" ,tar)))
@@ -91,7 +93,9 @@
          (setenv "LANG" "en_US.UTF-8")
          (let ((install-directory (string-append %output 
"/share/javascript/mathjax")))
            (system* "tar" "xvf" (assoc-ref %build-inputs "source")
-                    "MathJax-2.7.1/unpacked" "--strip" "2")
+                    ,(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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]