gnu: asymptote: Update to 2.49.

* gnu/packages/plotutils.scm (asymptote): Update to 2.49.
[native-inputs]: Re-order inputs.
[inputs]: Update to Python 3.  Add glew and glm.
[arguments]: Add a phase to fix build.  Remove unnecessary fix for tests.
This commit is contained in:
Nicolas Goaziou 2019-04-03 23:34:58 +02:00
parent c4cea85356
commit 4906a0b29d
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -171,21 +171,23 @@ (define-public ploticus
(define-public asymptote (define-public asymptote
(package (package
(name "asymptote") (name "asymptote")
(version "2.47") (version "2.49")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/asymptote/" (uri (string-append "mirror://sourceforge/asymptote/"
version "/asymptote-" version ".src.tgz")) version "/asymptote-" version ".src.tgz"))
(sha256 (sha256
(base32 (base32
"0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971")))) "1vljhq68gyc2503l9fj76rk1q4a4db9a1sp3fdfagqqmirnmybp5"))))
(build-system gnu-build-system) (build-system gnu-build-system)
;; Note: The 'asy' binary retains a reference to docdir for use with its ;; Note: The 'asy' binary retains a reference to docdir for use with its
;; "help" command in interactive mode, so adding a "doc" output is not ;; "help" command in interactive mode, so adding a "doc" output is not
;; currently useful. ;; currently useful.
(native-inputs (native-inputs
`(("gs" ,ghostscript) ;For tests `(("emacs" ,emacs-minimal)
("texinfo" ,texinfo) ;For generating documentation ("gs" ,ghostscript) ;For tests
("perl" ,perl)
("texinfo" ,texinfo) ;For generating documentation
;; For the manual and the tests. ;; For the manual and the tests.
("texlive" ,(texlive-union (list texlive-fonts-amsfonts ("texlive" ,(texlive-union (list texlive-fonts-amsfonts
texlive-latex-amsfonts texlive-latex-amsfonts
@ -193,15 +195,15 @@ (define-public asymptote
texlive-latex-graphics texlive-latex-graphics
texlive-latex-oberdiek ; for ifluatex texlive-latex-oberdiek ; for ifluatex
texlive-latex-parskip texlive-latex-parskip
texlive-tex-texinfo))) texlive-tex-texinfo)))))
("emacs" ,emacs-minimal)
("perl" ,perl)))
(inputs (inputs
`(("fftw" ,fftw) `(("fftw" ,fftw)
("freeglut" ,freeglut) ("freeglut" ,freeglut)
("glew" ,glew)
("glm" ,glm)
("gsl" ,gsl) ("gsl" ,gsl)
("libgc" ,libgc) ("libgc" ,libgc)
("python" ,python-2) ("python" ,python)
("readline" ,readline) ("readline" ,readline)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
@ -221,6 +223,13 @@ (define-public asymptote
"/share/texmf/tex/context/third")) "/share/texmf/tex/context/third"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-build
;; XXX: Build process complains about missing "config.h"
;; and "primitives.h" files.
(lambda _
(substitute* (find-files "." "\\.in$")
(("#include <primitives.h>") "#include \"primitives.h\""))
(invoke "touch" "prc/config.h")))
(add-before 'build 'patch-pdf-viewer (add-before 'build 'patch-pdf-viewer
(lambda _ (lambda _
;; Default to a free pdf viewer. ;; Default to a free pdf viewer.
@ -233,12 +242,6 @@ (define-public asymptote
;; "failed to create directory /homeless-shelter/.asy" error. ;; "failed to create directory /homeless-shelter/.asy" error.
(lambda _ (lambda _
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
;; The "gs" test fails, complaining about an incompatible
;; Ghostscript version. Not sure what's going on... Is this
;; because I've just replaced texlive with texlive-union?
(substitute* "tests/Makefile"
(("^(TESTDIRS =.*) gs(.*)" begin end)
(string-append begin " " end)))
#t)) #t))
(add-after 'install 'install-Emacs-data (add-after 'install 'install-Emacs-data
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)