From 77217b43935e5686a48d8a4676345efc3081fbdf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 Aug 2017 21:36:13 +0200 Subject: gnu: font-mathjax, js-mathjax: Remove hard-coded version. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 a723b9e815..2d1f6acfb9 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 ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,7 +60,8 @@ (define-public font-mathjax (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 @@ (define-public js-mathjax (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") -- cgit v1.2.3