guix_mirror_bot pushed a commit to branch misc-world-rebuild in repository guix.
commit 52344dd7811394895ba41d529dca8c63e2b127ee Author: Nicolas Graves <[email protected]> AuthorDate: Mon Apr 20 11:04:42 2026 +0900 gnu: octave-cli: Improve style. * gnu/packages/maths.scm (octave-cli)[arguments]: Run guix style. <#:phases>{configure-makeinfo}: Rewrite to use search-input-file. Change-Id: Iadfdab2ebf1f95b543dbe0de5311855b75e50176 --- gnu/packages/maths.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4987cfd0f3..ab63254752 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3592,23 +3592,24 @@ can solve two kinds of problems: (variable "CURLOPT_CAPATH") (files '("etc/ssl/certs"))))) (arguments - `(#:configure-flags - (list (string-append "--with-shell=" - (assoc-ref %build-inputs "bash") - "/bin/sh") - - ;; XXX: Without this flag, linking octave-cli fails with - ;; undefined references to 'logf@GLIBCXX_3.4' et.al. due to - ;; not pulling in liboctinterp.la for -lstdc++. - "--enable-link-all-dependencies") - #:phases - (modify-phases %standard-phases - (add-after 'configure 'configure-makeinfo - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "libinterp/corefcn/help.h" - (("\"makeinfo\"") - (string-append - "\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\"")))))))) + (list + #:configure-flags + #~(list (string-append "--with-shell=" + (assoc-ref %build-inputs "bash") + "/bin/sh") + + ;; XXX: Without this flag, linking octave-cli fails with + ;; undefined references to 'logf@GLIBCXX_3.4' et.al. due to + ;; not pulling in liboctinterp.la for -lstdc++. + "--enable-link-all-dependencies") + #:phases + #~(modify-phases %standard-phases + (add-after 'configure 'configure-makeinfo + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "libinterp/corefcn/help.h" + (("\"makeinfo\"") + (format #f "~s" + (search-input-file inputs "bin/makeinfo"))))))))) (home-page "https://www.gnu.org/software/octave/";) (synopsis "High-level language for numerical computation (no GUI)") (description "GNU Octave is a high-level interpreted language that is
