01/01: gnu: octave: Reference makeinfo with absolute path.

[Arun Isaac]

arunisaac pushed a commit to branch master
in repository guix.

commit 5ca4fe96969b5016e4e8a97131eb8b6b74f17620
Author: Arun Isaac <address@hidden>
Date:   Mon Aug 7 16:13:17 2017 +0530

    gnu: octave: Reference makeinfo with absolute path.
    
    * gnu/packages/maths.scm (octave)[arguments]: Add configure-makeinfo phase.
    [inputs]: Add texinfo.
    [native-inputs]: Remove texinfo.
---
 gnu/packages/maths.scm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 9aa0378..088f47f 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2017 ng0 <address@hidden>
 ;;; Copyright © 2017 Ben Woodcroft <address@hidden>
 ;;; Copyright © 2017 Theodoros Foradis <address@hidden>
+;;; Copyright © 2017 Arun Isaac <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1126,7 +1127,7 @@ can solve two kinds of problems:
     (license license:bsd-3)))
 
 ;; 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
   (package
     (name "octave")
@@ -1158,6 +1159,7 @@ can solve two kinds of problems:
        ("glu" ,glu)
        ("zlib" ,zlib)
        ("curl" ,curl)
+       ("texinfo" ,texinfo)
        ("graphicsmagick" ,graphicsmagick)))
     (native-inputs
      `(("lzip" ,lzip)
@@ -1172,14 +1174,23 @@ can solve two kinds of problems:
        ;; will still run without them, albeit without the features they
        ;; provide.
        ("less" ,less)
-       ("texinfo" ,texinfo)
        ("ghostscript" ,ghostscript)
        ("gnuplot" ,gnuplot)))
     (arguments
      `(#:configure-flags
        (list (string-append "--with-shell="
                             (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/";)
     (synopsis "High-level language for numerical computation")
     (description "GNU Octave is a high-level interpreted language that is