me
/
guix
Archived
1
0
Fork 0
Code

gnu: octave: Reference makeinfo with absolute path. 

* gnu/packages/maths.scm (octave)[arguments]: Add configure-makeinfo phase.
[inputs]: Add texinfo.
[native-inputs]: Remove texinfo.
master
Arun Isaac 2017-08-07 16:13:17 +05:30
parent e5788ebbe1
commit 5ca4fe9696
No known key found for this signature in database
GPG Key ID: 2E25EE8B61802BB3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/maths.scm
View File

@ -19,6 +19,7 @@
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1126,7 +1127,7 @@ can solve two kinds of problems:
(license license:bsd-3))) (license license:bsd-3)))
;; For a fully featured Octave, users are strongly recommended also to install ;; For a fully featured Octave, users are strongly recommended also to install
;; the following packages: texinfo, less, ghostscript, gnuplot. ;; the following packages: less, ghostscript, gnuplot.
(define-public octave (define-public octave
(package (package
(name "octave") (name "octave")
@ -1158,6 +1159,7 @@ can solve two kinds of problems:
("glu" ,glu) ("glu" ,glu)
("zlib" ,zlib) ("zlib" ,zlib)
("curl" ,curl) ("curl" ,curl)
("texinfo" ,texinfo)
("graphicsmagick" ,graphicsmagick))) ("graphicsmagick" ,graphicsmagick)))
(native-inputs (native-inputs
`(("lzip" ,lzip) `(("lzip" ,lzip)
@ -1172,14 +1174,23 @@ can solve two kinds of problems:
;; will still run without them, albeit without the features they ;; will still run without them, albeit without the features they
;; provide. ;; provide.
("less" ,less) ("less" ,less)
("texinfo" ,texinfo)
("ghostscript" ,ghostscript) ("ghostscript" ,ghostscript)
("gnuplot" ,gnuplot))) ("gnuplot" ,gnuplot)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list (string-append "--with-shell=" (list (string-append "--with-shell="
(assoc-ref %build-inputs "bash") (assoc-ref %build-inputs "bash")
"/bin/sh")))) "/bin/sh"))
#:phases
(modify-phases %standard-phases
(add-after 'configure 'configure-makeinfo
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "libinterp/corefcn/help.cc"
(("Vmakeinfo_program = \"makeinfo\"")
(string-append "Vmakeinfo_program = \""
(assoc-ref inputs "texinfo")
"/bin/makeinfo\"")))
#t)))))
(home-page "https://www.gnu.org/software/octave/") (home-page "https://www.gnu.org/software/octave/")
(synopsis "High-level language for numerical computation") (synopsis "High-level language for numerical computation")
(description "GNU Octave is a high-level interpreted language that is (description "GNU Octave is a high-level interpreted language that is