futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "gnu: maxima: Ensure gcc is available at runtime."

Browse Source 
This reverts commit f2fa86cc82b5941bde63b666337eea59aa609e55.
Commit 5ea8dbf0c906d51779ba0cf775ec9967f5f42382 fixes the underlying
issue in GNU Common Lisp.
This commit is contained in:
Kei Kebreau 2017-07-08 18:50:48 -04:00
parent 5ea8dbf0c9
commit 6b2eafaaa8
No known key found for this signature in database
GPG Key ID: E6A5EE3C19467A0D
1 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
gnu/packages/maths.scm
View File

@ -2075,8 +2075,7 @@ to BMP, JPEG or PNG image formats.")
(patches (search-patches "maxima-defsystem-mkdir.patch")))) (patches (search-patches "maxima-defsystem-mkdir.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("gcc" ,gcc) `(("gcl" ,gcl)
("gcl" ,gcl)
("gnuplot" ,gnuplot) ;for plots ("gnuplot" ,gnuplot) ;for plots
("tk" ,tk))) ;Tcl/Tk is used by 'xmaxima' ("tk" ,tk))) ;Tcl/Tk is used by 'xmaxima'
(native-inputs (native-inputs
@ -2098,44 +2097,36 @@ to BMP, JPEG or PNG image formats.")
;; '/tmp/nix-build-maxima-*', which won't exist at run time. ;; '/tmp/nix-build-maxima-*', which won't exist at run time.
;; Work around that. ;; Work around that.
#:make-flags (list "TMPDIR=/tmp") #:make-flags (list "TMPDIR=/tmp")
#:phases #:phases (alist-cons-before
(modify-phases %standard-phases 'check 'pre-check
(add-before 'configure 'set-gcc-path (lambda _
(lambda* (#:key inputs #:allow-other-keys) (chmod "src/maxima" #o555))
(substitute* "lisp-utils/defsystem.lisp" ;; Make sure the doc and emacs files are found in the
(("\\(defparameter \\*c-compiler\\* \"gcc\"\\)") ;; standard location. Also configure maxima to find gnuplot
(string-append "(defparameter *c-compiler* \"" ;; without having it on the PATH.
(assoc-ref inputs "gcc") "/bin/gcc\")"))) (alist-cons-after
#t)) 'install 'post-install
(add-before 'check 'pre-check (lambda* (#:key outputs inputs #:allow-other-keys)
(lambda _ (let* ((gnuplot (assoc-ref inputs "gnuplot"))
(chmod "src/maxima" #o555) (out (assoc-ref outputs "out"))
#t)) (datadir (string-append out "/share/maxima/" ,version)))
;; Make sure the doc and emacs files are found in the (with-directory-excursion out
;; standard location. Also configure maxima to find gnuplot (mkdir-p "share/emacs")
;; without having it on the PATH. (mkdir-p "share/doc")
(add-after 'install 'post-install (symlink
(lambda* (#:key outputs inputs #:allow-other-keys) (string-append datadir "/emacs/")
(let* ((gnuplot (assoc-ref inputs "gnuplot")) (string-append out "/share/emacs/site-lisp"))
(out (assoc-ref outputs "out")) (symlink
(datadir (string-append out "/share/maxima/" ,version))) (string-append datadir "/doc/")
(with-directory-excursion out (string-append out "/share/doc/maxima"))
(mkdir-p "share/emacs") (with-atomic-file-replacement
(mkdir-p "share/doc") (string-append datadir "/share/maxima-init.lisp")
(symlink (lambda (in out)
(string-append datadir "/emacs/") (format out "~a ~s~a~%"
(string-append out "/share/emacs/site-lisp")) "(setf $gnuplot_command "
(symlink (string-append gnuplot "/bin/gnuplot") ")")
(string-append datadir "/doc/") (dump-port in out))))))
(string-append out "/share/doc/maxima")) %standard-phases))))
(with-atomic-file-replacement
(string-append datadir "/share/maxima-init.lisp")
(lambda (in out)
(format out "~a ~s~a~%"
"(setf $gnuplot_command "
(string-append gnuplot "/bin/gnuplot") ")")
(dump-port in out)))))
#t)))))
(home-page "http://maxima.sourceforge.net") (home-page "http://maxima.sourceforge.net")
(synopsis "Numeric and symbolic expression manipulation") (synopsis "Numeric and symbolic expression manipulation")
(description "Maxima is a system for the manipulation of symbolic and (description "Maxima is a system for the manipulation of symbolic and