01/01: gnu: lyx: Parameterize more version variables.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit e5a0348962b9dbf222c3a96c3fad7c460dd5a5ca
Author: Efraim Flashner <address@hidden>
Date:   Sat Mar 2 22:15:26 2019 +0200

    gnu: lyx: Parameterize more version variables.
    
    * gnu/packages/tex.scm (lyx)[source]: Parameterize the version string.
    [arguments]: Parameterize version variables in 'configre-flags and in
    the custom phases 'setenv-check and 'install-symlink.
---
 gnu/packages/tex.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index f7f8fc3..3248076 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2014 Eric Bavier <address@hidden>
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2016 Roel Janssen <address@hidden>
-;;; Copyright © 2016, 2018 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2018, 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2016 Federico Beffa <address@hidden>
 ;;; Copyright © 2016 Thomas Danckaert <address@hidden>
 ;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <address@hidden>
@@ -5542,7 +5542,8 @@ and Karl Berry.")
     (version "2.3.2-2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/2.3.x/";
+              (uri (string-append "http://ftp.lyx.org/pub/lyx/stable/";
+                                  (version-major+minor version) ".x/"
                                   name "-" version ".tar.gz"))
               (sha256
                (base32
@@ -5561,7 +5562,7 @@ and Karl Berry.")
                            ,(string-append "-DLYX_INSTALL_PREFIX="
                                            (assoc-ref %outputs "out")
                                            ;; Exact name and level is 
necessary.
-                                           "/lyx2.3"))
+                                           "/lyx" ,(version-major+minor 
version)))
        #:phases
        (modify-phases %standard-phases
          ;; See ;; 
https://www.lyx.org/trac/changeset/3a123b90af838b08680471d87170c38e56787df9/lyxgit
@@ -5593,15 +5594,19 @@ and Karl Berry.")
                                                  ,version
                                                  
"/src/tests/check_layout.cmake")
                (const #t))
-             (setenv "LYX_DIR_23x" (string-append (getcwd) "/../lyx-"
-                                                  ,version "/lib"))
+             (setenv (string-append "LYX_DIR_"
+                                    (string-join
+                                      (string-split
+                                        ,(version-major+minor version) #\-)) 
"x")
+                     (string-append (getcwd) "/../lyx-" ,version "/lib"))
              #t))
          (add-after 'install 'install-symlinks
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (mkdir-p (string-append out "/bin"))
-               (symlink "../lyx2.3/bin/lyx2.3"
-                        (string-append out "/bin/lyx2.3"))
+               (symlink (string-append "../lyx" ,(version-major+minor version)
+                                       "/bin/lyx" ,(version-major+minor 
version))
+                        (string-append out "/bin/lyx" ,(version-major+minor 
version)))
                #t))))))
     (inputs
      `(("boost" ,boost)