From patchwork Thu Sep 28 19:03:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 54377 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DD9CC27BBE9; Thu, 28 Sep 2023 20:04:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CBFC327BBE2 for ; Thu, 28 Sep 2023 20:04:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlwIm-00071T-7x; Thu, 28 Sep 2023 15:03:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qlwIj-00070w-3I for guix-patches@gnu.org; Thu, 28 Sep 2023 15:03:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qlwIi-00051C-RA for guix-patches@gnu.org; Thu, 28 Sep 2023 15:03:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlwIr-0007rJ-OH; Thu, 28 Sep 2023 15:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v2] gnu: scilab: Fix and hardcode script inputs. References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> In-Reply-To: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 28 Sep 2023 19:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr, Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169592782030180 (code B ref 65853); Thu, 28 Sep 2023 19:04:01 +0000 Received: (at 65853) by debbugs.gnu.org; 28 Sep 2023 19:03:40 +0000 Received: from localhost ([127.0.0.1]:54505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlwIW-0007qi-8m for submit@debbugs.gnu.org; Thu, 28 Sep 2023 15:03:40 -0400 Received: from 10.mo584.mail-out.ovh.net ([188.165.33.109]:46023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlwIS-0007qS-A1 for 65853@debbugs.gnu.org; Thu, 28 Sep 2023 15:03:38 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.16.251]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 1AD5224EB9 for <65853@debbugs.gnu.org>; Thu, 28 Sep 2023 19:03:20 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-9zv2q (unknown [10.110.171.110]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C63EA1FE8C; Thu, 28 Sep 2023 19:03:19 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-9zv2q with ESMTPSA id paSJLPfNFWWDIwAAAUoqFQ (envelope-from ); Thu, 28 Sep 2023 19:03:19 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003a3e2bc48-cdc5-49bb-8a5c-ba45762f52fb, 57906430550E741FE59AD178AEB9473F26373A74) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Thu, 28 Sep 2023 21:03:10 +0200 Message-ID: <0dd0a7387a8232abd43f484b87f183c9340497b0.1695927790.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 14841612575221801698 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrtddtgddutddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfeehgeehleffleejhefhgeefkeektdetvdevhfdvudfggeehueffffdthfduleelnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: f9784991eb6c7ec1a20f76d080873a3319be0908 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