From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SI5bMqsA/mSHFQAA9RJhRA:P1 (envelope-from ) for ; Sun, 10 Sep 2023 19:45:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SI5bMqsA/mSHFQAA9RJhRA (envelope-from ) for ; Sun, 10 Sep 2023 19:45: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 69856396E5 for ; Sun, 10 Sep 2023 19:45:15 +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=1694367915; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=92gDzZLp70E6534ILIppsmwanVPWP38ZLbhWQWQBxHE=; b=dIMs68rou8zmRpMHFUkYl7k/xEn2OEkK+TvsZYpulTu+ozvZbCs6GtQYr1sXDEUOHBvt+J bOWJOkyZIbbXgjFqj3dZ5jBjfslCRseBL+OtnSPCh8s1HbIBEekjbI7TUqICl4Fu62/+/y Gj7EZLqHgWIE/LxzC26Lz1F4ENVKUD4HGPMGlS7lxGyOd4IJO2+V0sB9QLp95uK3+NE9st BzZeyVubS+fqc6ufKBrRdYnm8B2GfUcP5750O43I8/9O1NFUW0/Q44bqSmTZglW3nNFnc5 rTJRnvrkE68q9RTl7v2B4jqisE2sR7VRrOTJsmYJsKRTmf6UOwxCtdxvxxaWXA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694367915; a=rsa-sha256; cv=none; b=jOxgRdQOrfrgeM0qZ1EzlqnUxZJ5dpGIietZzA6EQF1BNYGELe3CyqTDMU8BZRqbj9jNCB a5n2guW3fSoanQOdqDyRH5BzlRAnhNADOcuS8ponOywn56OM6SpPCLMUtWpcg0lSNE2vqa lPiO88xkHRONu96J3g3EfPAXd5zT0z/lv9OBzYtVEL8jAivL4jbgT0OK3ygU5dQdYx/ku4 2cnLRIuTAQOI0jub2PNF+8wLPzO3gU5N9JIpw4WKKk2tufPqpe1PPymLDNd16mwX9142e1 Qifz6UFQCe8zKdHh/WxzGQF3KE8tG5ppDB162hG3Jf4m3de8BML61z7OhqXMDg== 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 1qfOUW-00068O-7r; Sun, 10 Sep 2023 13:45:00 -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 1qfOUV-00068G-2C for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:59 -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 1qfOUU-0008RX-Qf for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfOUX-0004v4-Rk; Sun, 10 Sep 2023 13:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65856] [PATCH v2 1/2] gnu: scilab: Fix and hardcode script inputs. 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: Sun, 10 Sep 2023 17:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65856 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65856@debbugs.gnu.org Cc: ngraves@ngraves.fr, Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by submit@debbugs.gnu.org id=B.169436785918836 (code B ref -1); Sun, 10 Sep 2023 17:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Sep 2023 17:44:19 +0000 Received: from localhost ([127.0.0.1]:51253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOTr-0004ti-4x for submit@debbugs.gnu.org; Sun, 10 Sep 2023 13:44:19 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOTp-0004tO-Qm for submit@debbugs.gnu.org; Sun, 10 Sep 2023 13:44:18 -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 1qfOTd-0005uo-IQ for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:06 -0400 Received: from 6.mo560.mail-out.ovh.net ([87.98.165.38]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfOTW-0008L5-Mw for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:05 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.16.29]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 2E178252C5 for ; Sun, 10 Sep 2023 17:43:56 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-m6bxg (unknown [10.110.115.95]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B777D1FD6F; Sun, 10 Sep 2023 17:43:55 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-m6bxg with ESMTPSA id UfjEKFsA/mQ4WAAADlAcgg (envelope-from ); Sun, 10 Sep 2023 17:43:55 +0000 X-OVh-ClientIp: 176.179.132.86 Date: Sun, 10 Sep 2023 19:43:40 +0200 Message-ID: <6d38ad3f36cb03c4ae6d715edcb741b5602a2997.1694367821.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 25895701456872162 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudeivddgudduhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefheegheelffeljeehhfegfeekkedttedvvefhvddugfegheeufffftdfhudelleenucffohhmrghinhepshgtihhlrggsrdhorhhgnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufedvrdekiedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=87.98.165.38; envelope-from=ngraves@ngraves.fr; helo=6.mo560.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Spam-Score: -6.22 X-Migadu-Queue-Id: 69856396E5 X-Migadu-Spam-Score: -6.22 X-TUID: AaSCBtAAeZuI * gnu/packages/maths.scm (scilab): Fix script inputs. [inputs]: Reorder alphabetically. Add coreutils, grep, sed. [arguments](phases): Add phase hardcode-script-inputs. --- gnu/packages/maths.scm | 51 +++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 38e71e18f8..900a9f0fac 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8448,22 +8448,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 + 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 @@ -8499,10 +8502,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") @@ -8534,7 +8533,27 @@ (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") + #$(file-append (this-package-input "grep") "/bin/grep")) + (("\\| sed") + (string-append + "| " #$(file-append (this-package-input "sed") "/bin/sed"))) + (("/bin/ls") + #$(file-append (this-package-input "coreutils") + "/bin/ls")) + (("uname") + #$(file-append (this-package-input "coreutils") + "/bin/uname")) + (("dirname") + #$(file-append (this-package-input "coreutils") + "/bin/dirname")) + (("basename") + #$(file-append (this-package-input "coreutils") + "/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: 2eb6df537c36da8bf8e81ff698421f6fb1bfd1ab prerequisite-patch-id: eb618ab7b10483d917c308a38792af98baa517e2 prerequisite-patch-id: 40b6c9f09f27833367a71ec25d77afae4d2a835e prerequisite-patch-id: c12968d02d99c253f858586a86b16fa32d41f1c1 prerequisite-patch-id: 09d995d48139f8e61183d5634cda13a01cdb50f7 prerequisite-patch-id: 86baa45ec2aad977c8c8135f7613aa391155de6d prerequisite-patch-id: 3425fbbff6a603d60b4e143ea2141aabf4ddc92c prerequisite-patch-id: c373c01aab5dcba3503a97d51c62a595147a041c prerequisite-patch-id: cda857c790b88c681c4e713c5f71e40291970daf prerequisite-patch-id: 8e234d0f4d93d2aad499eec8842be3d28da98707 prerequisite-patch-id: 5f664cb2fd995a53765c5ffc19a708ac795cc0c4 prerequisite-patch-id: ed447cba9cf9b7e1a1b47aa27acb14f8f2da0a8e prerequisite-patch-id: 9f80c5bbbfb8cd3347951c4d57634e93ffa79924 prerequisite-patch-id: 1aaa9f0d466e2d6837f75844df48a98beb70ff24 prerequisite-patch-id: 34502820d8c0355b3ed2638c457084edeaba029d prerequisite-patch-id: a96258da9e78cfb9ac9893cdcdeb38b69b75f134 prerequisite-patch-id: 536470ccb53bbb5672363863c14c082ecc0d5b0a -- 2.41.0