diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2023-11-06 00:51:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-11-23 12:56:43 +0100 |
| commit | 70b1ac2bc56d57565d3c0cae6d62588cefd35bb3 (patch) | |
| tree | 14bd42609c953e5088f5ac1b17124068e19461de | |
| parent | d2a4beaf04d90fd26495ac6e05ddc2cae1a96524 (diff) | |
| download | guix-70b1ac2bc56d57565d3c0cae6d62588cefd35bb3.tar.gz | |
gnu: scilab: Use gexp for tcl and tk libraries.
* gnu/packages/maths.scm (scilab): Use gexp for tcl and tk libraries. [argments](configure-flags): Use gexp for tcl and tk libraries. Change-Id: I31fe9a9e2afd9b6266a2e7a2c7044b3c9d0dfa4f Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/maths.scm | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6b208d188a..abc0dc748d 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9626,6 +9626,8 @@ computation is supported via MPI.") tcl tk)) (arguments + (let* ((tcl (this-package-input "tcl")) + (tk (this-package-input "tk"))) (list #:configure-flags #~(list @@ -9638,18 +9640,10 @@ computation is supported via MPI.") "--disable-build-help" "--with-external-scirenderer" ;; Tcl and Tk library locations. - (string-append "--with-tcl-include=" - (dirname - (search-input-file %build-inputs "include/tcl.h"))) - (string-append "--with-tcl-library=" - (dirname - (search-input-directory %build-inputs "lib/tcl8"))) - (string-append "--with-tk-include=" - (dirname - (search-input-file %build-inputs "include/tk.h"))) - (string-append "--with-tk-library=" - (dirname - (search-input-directory %build-inputs "lib/tk8.6"))) + (string-append "--with-tcl-include=" #$tcl "/include") + (string-append "--with-tcl-library=" #$tcl "/lib") + (string-append "--with-tk-include=" #$tk "/include") + (string-append "--with-tk-library=" #$tk "/lib") (string-append "--with-eigen-include=" (search-input-directory %build-inputs "include/eigen3")) ;; Find and link to the OCaml Num package @@ -9714,7 +9708,7 @@ computation is supported via MPI.") (apply invoke "make" "src/cpp/parse/parsescilab.cpp" "src/cpp/parse/scanscilab.cpp" - make-flags))))))) + make-flags)))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab |