From patchwork Sun Nov 5 23:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55967 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 A0EC027BBE9; Mon, 6 Nov 2023 00:05:08 +0000 (GMT) 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 0494F27BBE2 for ; Mon, 6 Nov 2023 00:05:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6S-0004ii-9F; Sun, 05 Nov 2023 19:04:28 -0500 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 1qzn6Q-0004i1-VL for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 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 1qzn6Q-0000R2-Lu for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn71-0008VU-Lh for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 4/8] gnu: scilab: Add phase rewrap-scilab-cli. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:03 +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 Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908532602 (code B ref 65853); Mon, 06 Nov 2023 00:05:03 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:45 +0000 Received: from localhost ([127.0.0.1]:38402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6i-0008TT-Mu for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:45 -0500 Received: from 7.mo575.mail-out.ovh.net ([46.105.63.230]:54499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6d-0008Sc-EL for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:42 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.146.32]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4DAA525785 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:01 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-9rbmq (unknown [10.110.208.248]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 046321FDD5; Mon, 6 Nov 2023 00:04:00 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-9rbmq with ESMTPSA id +yZKOnAtSGV3yAkAX5pIgQ (envelope-from ); Mon, 06 Nov 2023 00:04:00 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002f1b52d5c-0adc-4a72-9fe2-f339832741b7, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Mon, 6 Nov 2023 00:51:47 +0100 Message-ID: <20231106000354.32423-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 3274398406948414178 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeekgeevkeffudelveevveekjeetkefgtdejhefgfedvvdffvdefffejudfgfffgnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht 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): Add phase rewrap-scilab-cli. Change-Id: Ia3ca5df1a4795c34b6c1cdc8c3b0d7cc2badf0cb --- gnu/packages/maths.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 62c935a868..68e041c33b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9703,7 +9703,27 @@ (define-public scilab (apply invoke "make" "src/cpp/parse/parsescilab.cpp" "src/cpp/parse/scanscilab.cpp" - make-flags)))))))) + make-flags)))) + ;; The startup script is mostly there to define the following env + ;; variables properly. We can do this with guix directly. + (add-after 'install 'rewrap-scilab-cli + (lambda _ + (define (bin path) (string-append #$output "/bin/" path)) + (delete-file (bin "scilab-cli")) + (wrap-program (bin "scilab-cli-bin") + `("SCI" = (,(string-append #$output "/share/scilab"))) + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append #$output "/lib/scilab"))) + `("TCL_LIBRARY" = (,(string-append #$tcl "/lib"))) + `("TK_LIBRARY" = (,(string-append #$tk "/lib")))) + (copy-file (bin "scilab-cli-bin") (bin "scilab-cli")) + (copy-file (bin ".scilab-cli-bin-real") (bin "scilab-cli-bin")) + (delete-file (bin ".scilab-cli-bin-real")) + (substitute* (bin "scilab-cli") + (("\\.scilab-cli-bin-real") + "scilab-cli-bin") + (("export SCI=") + "unset LANGUAGE\nexport SCI=")))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab