From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UKFeFC/OFWUSDAAAauVa8A:P1 (envelope-from ) for ; Thu, 28 Sep 2023 21:04:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UKFeFC/OFWUSDAAAauVa8A (envelope-from ) for ; Thu, 28 Sep 2023 21:04:15 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DC51FE896 for ; Thu, 28 Sep 2023 21:04:14 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695927855; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=1XkuzfQYLAp+AnEpQeA18IE0CRDeMTn1Kn4NvZ13tQc=; b=nkJtMAVebMD/0rXiRfkJXCjBrROKSdZO4YhHXzOPKPwf/z+4qHwRgOupUx4XsjdNKhCM0t B8X3but/RGu4LnLa5l+WTUfxBr3JgA6RmmepIyc/OO23udzjFS0GpZVmY1qIMNEgk9UYna kwfoXC6AGpt4jQcgDqY2PVeIW/J62Mc0/zM4T4L2S4ng+t7vVg3JczHrMGfnRB5KyMRF+D 5/ADIGb1JAprIXmGBIhT7l7IXYs8J5p7VjNtOAD6AKY2xVplRpSEdmHtBEGSk0bhGEyoBN oDeluIFil5bftEmlhT1+bWtKfU56SvIL5peHJmhFVjE9XTiQ0JC8fhLspJKMag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695927855; a=rsa-sha256; cv=none; b=bF5jndxSgiyVG0f6eOnkdEYrS9QPNxgCrAVlQ8/Kc7+q/IeVEAdNDsjJqYwJ/Bt3O7fiw0 7WT2VthWxrFVevOi7Ekcvm/KzV+dCIsVgv3wSeAtyRZtNziFC3rsGLiPy2BRkyZslzrmr7 JUYsUErT+aEZWdyomUpErTfMvTbuOC3Nn9Hs2dyWCQOMmTMQJzek1Bf79+jif4JweCcOoN VbFVFEIDZnpDkZrAjR8Wp7sQuKVFTUOpfKTuKrSP2GLDTL7yaf0an7G6/zaZhSHtip3Otf DaejwvAe06rdTTV69v0ajDRj0UkPCWUuZD+5tRa2QllJymS1YCle6ABK/jvdhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org 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 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 Content-Transfer-Encoding: 8bit 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -6.24 X-Spam-Score: -6.24 X-Migadu-Queue-Id: DC51FE896 X-TUID: qbm85rV3jmRn * 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