all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 65853@debbugs.gnu.org
Cc: ngraves@ngraves.fr, Andreas Enge <andreas@enge.fr>,
	Efraim Flashner <efraim@flashner.co.il>,
	Eric Bavier <bavier@posteo.net>
Subject: [bug#65853] [PATCH v2] gnu: scilab: Fix and hardcode script inputs.
Date: Thu, 28 Sep 2023 21:03:10 +0200	[thread overview]
Message-ID: <0dd0a7387a8232abd43f484b87f183c9340497b0.1695927790.git.ngraves@ngraves.fr> (raw)
In-Reply-To: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr>

* gnu/packages/maths.scm (scilab): Fix script inputs.
[inputs]: Reorder alphabetically. Add coreutils-minimal, grep, sed.
[arguments](phases): Add phase hardcode-script-inputs.
---
 gnu/packages/maths.scm | 46 +++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 62d4adfbd1..f7e1de41f3 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8433,22 +8433,25 @@ (define-public scilab
         (base32 "0phg9pn24yw98hbh475ik84dnikf1225b2knh7qbhdbdx6fm2d57"))))
     (build-system gnu-build-system)
     (native-inputs (list pkg-config gfortran))
-    (inputs (list libxml2
+    (inputs (list arpack-ng
+                  coreutils-minimal
+                  curl
+                  fftw
+                  gettext-minimal
+                  grep
+                  hdf5-1.8
+                  lapack
+                  libxml2
+                  libx11
+                  matio
+                  openblas
                   `(,pcre "bin")
                   `(,pcre "out")
                   readline
-                  hdf5-1.8
-                  curl
-                  openblas
-                  lapack
-                  arpack-ng
-                  fftw
-                  gettext-minimal
+                  sed
                   suitesparse-3
                   tcl
-                  tk
-                  libx11
-                  matio))
+                  tk))
     (arguments
      `(#:tests? #f
        #:configure-flags
@@ -8484,10 +8487,6 @@ (define-public scilab
        ,#~(modify-phases %standard-phases
             (add-before 'build 'pre-build
               (lambda _
-                ;; Fix scilab script.
-                (substitute* "bin/scilab"
-                  (("\\/bin\\/ls")
-                   (which "ls")))
                 ;; Fix core.start.
                 (substitute* "modules/core/etc/core.start"
                   (("'SCI/modules")
@@ -8519,7 +8518,22 @@ (define-public scilab
                   (("if \\(array_size > 0\\)")
                    "if (*array_size > 0)"))
                 ;; Set SCIHOME to /tmp before macros compilation.
-                (setenv "SCIHOME" "/tmp"))))))
+                (setenv "SCIHOME" "/tmp")))
+            (add-after 'install 'hardcode-script-inputs
+              (lambda _
+                (substitute* (string-append #$output "/bin/scilab")
+                  (("grep")
+                   (search-inputs-file #$inputs "/bin/grep"))
+                  ((" sed ")  ; some "sed" strings are not binaries invocations
+                   (string-append " " (search-inputs-file #$inputs "/bin/sed") " "))
+                  (("/bin/ls")
+                   (search-inputs-file #$inputs "/bin/ls"))
+                  (("uname")
+                   (search-inputs-file #$inputs "/bin/uname"))
+                  (("dirname")
+                   (search-inputs-file #$inputs "/bin/dirname"))
+                  (("basename")
+                   (search-inputs-file #$inputs "/bin/basename"))))))))
     (home-page "https://scilab.org")
     (synopsis "Software for engineers and scientists")
     (description "This package provides the non-graphical version of the Scilab

base-commit: f9784991eb6c7ec1a20f76d080873a3319be0908
-- 
2.41.0





  parent reply	other threads:[~2023-09-28 19: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 ` Nicolas Graves via Guix-patches via [this message]
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   ` [bug#65853] [PATCH v3 3/8] gnu: scilab: Use gexp for tcl and tk libraries Nicolas Graves via Guix-patches via
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=0dd0a7387a8232abd43f484b87f183c9340497b0.1695927790.git.ngraves@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=65853@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=bavier@posteo.net \
    --cc=efraim@flashner.co.il \
    --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.