ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit f2fa86cc82.
Commit 5ea8dbf0c9 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 @@ (define-public maxima
(patches (search-patches "maxima-defsystem-mkdir.patch"))))
(build-system gnu-build-system)
(inputs
`(("gcc" ,gcc)
("gcl" ,gcl)
`(("gcl" ,gcl)
("gnuplot" ,gnuplot) ;for plots
("tk" ,tk))) ;Tcl/Tk is used by 'xmaxima'
(native-inputs
@ -2098,44 +2097,36 @@ (define-public maxima
;; '/tmp/nix-build-maxima-*', which won't exist at run time.
;; Work around that.
#:make-flags (list "TMPDIR=/tmp")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'set-gcc-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "lisp-utils/defsystem.lisp"
(("\\(defparameter \\*c-compiler\\* \"gcc\"\\)")
(string-append "(defparameter *c-compiler* \""
(assoc-ref inputs "gcc") "/bin/gcc\")")))
#t))
(add-before 'check 'pre-check
(lambda _
(chmod "src/maxima" #o555)
#t))
;; Make sure the doc and emacs files are found in the
;; standard location. Also configure maxima to find gnuplot
;; without having it on the PATH.
(add-after 'install 'post-install
(lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((gnuplot (assoc-ref inputs "gnuplot"))
(out (assoc-ref outputs "out"))
(datadir (string-append out "/share/maxima/" ,version)))
(with-directory-excursion out
(mkdir-p "share/emacs")
(mkdir-p "share/doc")
(symlink
(string-append datadir "/emacs/")
(string-append out "/share/emacs/site-lisp"))
(symlink
(string-append datadir "/doc/")
(string-append out "/share/doc/maxima"))
(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)))))
#:phases (alist-cons-before
'check 'pre-check
(lambda _
(chmod "src/maxima" #o555))
;; Make sure the doc and emacs files are found in the
;; standard location. Also configure maxima to find gnuplot
;; without having it on the PATH.
(alist-cons-after
'install 'post-install
(lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((gnuplot (assoc-ref inputs "gnuplot"))
(out (assoc-ref outputs "out"))
(datadir (string-append out "/share/maxima/" ,version)))
(with-directory-excursion out
(mkdir-p "share/emacs")
(mkdir-p "share/doc")
(symlink
(string-append datadir "/emacs/")
(string-append out "/share/emacs/site-lisp"))
(symlink
(string-append datadir "/doc/")
(string-append out "/share/doc/maxima"))
(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))))))
%standard-phases))))
(home-page "http://maxima.sourceforge.net")
(synopsis "Numeric and symbolic expression manipulation")
(description "Maxima is a system for the manipulation of symbolic and