From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 65853@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#65853] [PATCH v3 3/8] gnu: scilab: Use gexp for tcl and tk libraries.
Date: Mon, 6 Nov 2023 00:51:46 +0100 [thread overview]
Message-ID: <20231106000354.32423-4-ngraves@ngraves.fr> (raw)
In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr>
* 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
---
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 f6d0575979..62c935a868 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -9621,6 +9621,8 @@ (define-public scilab
tcl
tk))
(arguments
+ (let* ((tcl (this-package-input "tcl"))
+ (tk (this-package-input "tk")))
(list
#:configure-flags
#~(list
@@ -9633,18 +9635,10 @@ (define-public scilab
"--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
@@ -9709,7 +9703,7 @@ (define-public scilab
(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
--
2.41.0
next prev parent reply other threads:[~2023-11-06 0:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-10 16:18 [bug#65853] [PATCH] gnu: scilab: Fix and hardcode script inputs Nicolas Graves via Guix-patches via
2023-09-28 16:36 ` Efraim Flashner
2023-09-28 18:30 ` Nicolas Graves via Guix-patches via
2023-09-28 19:03 ` [bug#65853] [PATCH v2] " Nicolas Graves via Guix-patches via
2023-10-05 14:51 ` [bug#65853] bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs Ludovic Courtès
2023-10-05 15:09 ` [bug#65857] " Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` [bug#65853] [PATCH v3 0/8] Scilab: Big update Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` [bug#65853] [PATCH v3 1/8] gnu: scilab: Remove uneeded code Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` [bug#65853] [PATCH v3 2/8] gnu: scilab: Activate tests and disable failing tests Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` Nicolas Graves via Guix-patches via [this message]
2023-11-05 23:51 ` [bug#65853] [PATCH v3 4/8] gnu: scilab: Add phase rewrap-scilab-cli Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` [bug#65853] [PATCH v3 5/8] gnu: scilab: Reindent Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` [bug#65853] [PATCH v3 6/8] gnu: scilab: Update to 2024.0.0 Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` [bug#65853] [PATCH v3 7/8] gnu: scilab: Add phase set-version Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` [bug#65853] [PATCH v3 8/8] gnu: scilab: Set default SCIHOME value Nicolas Graves via Guix-patches via
2023-11-23 10:30 ` [bug#65857] [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231106000354.32423-4-ngraves@ngraves.fr \
--to=guix-patches@gnu.org \
--cc=65853@debbugs.gnu.org \
--cc=ngraves@ngraves.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.