diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2026-04-20 11:04:42 +0900 |
|---|---|---|
| committer | Nguyễn Gia Phong <cnx@loang.net> | 2026-07-22 12:20:08 +0900 |
| commit | bf1a8cbad93ce091b5663eeeccc595bd04be7eff (patch) | |
| tree | c1629b6a08defc1597396ffb787d9a3b4b064be0 /gnu/packages | |
| parent | 7990316d029018e6c4efdefe4d5772c4a1d0ccdd (diff) | |
gnu: octave-cli: Improve style.
* gnu/packages/maths.scm (octave-cli)[arguments]: Run guix style.
<#:phases>{configure-makeinfo}: Rewrite to use search-input-file.
Merges: https://codeberg.org/guix/guix/pulls/7884
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/maths.scm | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a1bdb41a309..7740b3cbf41 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm | |||
| @@ -3594,23 +3594,24 @@ can solve two kinds of problems: | |||
| 3594 | (variable "CURLOPT_CAPATH") | 3594 | (variable "CURLOPT_CAPATH") |
| 3595 | (files '("etc/ssl/certs"))))) | 3595 | (files '("etc/ssl/certs"))))) |
| 3596 | (arguments | 3596 | (arguments |
| 3597 | `(#:configure-flags | 3597 | (list |
| 3598 | (list (string-append "--with-shell=" | 3598 | #:configure-flags |
| 3599 | (assoc-ref %build-inputs "bash") | 3599 | #~(list (string-append "--with-shell=" |
| 3600 | "/bin/sh") | 3600 | (assoc-ref %build-inputs "bash") |
| 3601 | 3601 | "/bin/sh") | |
| 3602 | ;; XXX: Without this flag, linking octave-cli fails with | 3602 | |
| 3603 | ;; undefined references to 'logf@GLIBCXX_3.4' et.al. due to | 3603 | ;; XXX: Without this flag, linking octave-cli fails with |
| 3604 | ;; not pulling in liboctinterp.la for -lstdc++. | 3604 | ;; undefined references to 'logf@GLIBCXX_3.4' et.al. due to |
| 3605 | "--enable-link-all-dependencies") | 3605 | ;; not pulling in liboctinterp.la for -lstdc++. |
| 3606 | #:phases | 3606 | "--enable-link-all-dependencies") |
| 3607 | (modify-phases %standard-phases | 3607 | #:phases |
| 3608 | (add-after 'configure 'configure-makeinfo | 3608 | #~(modify-phases %standard-phases |
| 3609 | (lambda* (#:key inputs #:allow-other-keys) | 3609 | (add-after 'configure 'configure-makeinfo |
| 3610 | (substitute* "libinterp/corefcn/help.h" | 3610 | (lambda* (#:key inputs #:allow-other-keys) |
| 3611 | (("\"makeinfo\"") | 3611 | (substitute* "libinterp/corefcn/help.h" |
| 3612 | (string-append | 3612 | (("\"makeinfo\"") |
| 3613 | "\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\"")))))))) | 3613 | (format #f "~s" |
| 3614 | (search-input-file inputs "bin/makeinfo"))))))))) | ||
| 3614 | (home-page "https://www.gnu.org/software/octave/") | 3615 | (home-page "https://www.gnu.org/software/octave/") |
| 3615 | (synopsis "High-level language for numerical computation (no GUI)") | 3616 | (synopsis "High-level language for numerical computation (no GUI)") |
| 3616 | (description "GNU Octave is a high-level interpreted language that is | 3617 | (description "GNU Octave is a high-level interpreted language that is |
