[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/15: gnu: scilab: Use gexp for tcl and tk libraries.
From: |
guix-commits |
Subject: |
04/15: gnu: scilab: Use gexp for tcl and tk libraries. |
Date: |
Thu, 23 Nov 2023 06:58:15 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 70b1ac2bc56d57565d3c0cae6d62588cefd35bb3
Author: Nicolas Graves <ngraves@ngraves.fr>
AuthorDate: Mon Nov 6 00:51:46 2023 +0100
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>
---
gnu/packages/maths.scm | 20 +++++++-------------
1 file 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
- branch master updated (5023424f16 -> 8d596af2c9), guix-commits, 2023/11/23
- 01/15: services: Add oci-container-service-type., guix-commits, 2023/11/23
- 02/15: gnu: scilab: Remove uneeded code., guix-commits, 2023/11/23
- 04/15: gnu: scilab: Use gexp for tcl and tk libraries.,
guix-commits <=
- 09/15: gnu: scilab: Set default SCIHOME value., guix-commits, 2023/11/23
- 11/15: gnu: Add coq-for-coqtail., guix-commits, 2023/11/23
- 15/15: gnu: folly: Update to 2023.11.06.00., guix-commits, 2023/11/23
- 03/15: gnu: scilab: Activate tests and disable failing tests., guix-commits, 2023/11/23
- 05/15: gnu: scilab: Add phase rewrap-scilab-cli., guix-commits, 2023/11/23
- 06/15: gnu: scilab: Reindent., guix-commits, 2023/11/23
- 08/15: gnu: scilab: Add phase set-version., guix-commits, 2023/11/23
- 07/15: gnu: scilab: Update to 2024.0.0., guix-commits, 2023/11/23
- 10/15: gnu: Add vim-vader., guix-commits, 2023/11/23
- 13/15: gnu: guile-ts: Update to 0.2.0., guix-commits, 2023/11/23