From patchwork Sun Nov 5 23:51:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55969 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 9B4DE27BBE2; Mon, 6 Nov 2023 00:05:15 +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 46B6227BBE9 for ; Mon, 6 Nov 2023 00:05:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6Z-0004lJ-23; Sun, 05 Nov 2023 19:04:35 -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 1qzn6T-0004ji-4q for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:29 -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 1qzn6S-0000S2-Qw for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:28 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn73-0008W5-Qp for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 8/8] gnu: scilab: Set default SCIHOME value. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:05 +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.169922909132656 (code B ref 65853); Mon, 06 Nov 2023 00:05:05 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:51 +0000 Received: from localhost ([127.0.0.1]:38414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6o-0008UY-LB for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:50 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:38747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6k-0008Tu-BH for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:47 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.146.132]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4ECC425C48 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:08 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-wfccv (unknown [10.110.208.152]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id ED7901FE4F; Mon, 6 Nov 2023 00:04:07 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-wfccv with ESMTPSA id mXggOHctSGU2qhAAEdL+9w (envelope-from ); Mon, 06 Nov 2023 00:04:07 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002f8408775-e5b0-4624-9a98-2db34c4489a3, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Mon, 6 Nov 2023 00:51:51 +0100 Message-ID: <20231106000354.32423-9-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: 3276368731923014370 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdeghfffhfefudduheeggeegffefuedvffeuheeuveejveelleeukeeujedutddunecuffhomhgrihhnpehhohhmvgdrlhhotggrlhdpshgtihhlrggsrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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): Set default SCIHOME value. [argmuments](phases)[rewrap-scilab-cli]: Set default -scihome option to respect XDG base dirs specification. Change-Id: I9b55758a3ca1fbc523c3e40e891a2462f3246390 --- gnu/packages/maths.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index dae4c528e2..355f2132bd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9734,8 +9734,12 @@ (define (bin path) (string-append #$output "/bin/" path)) (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") + ;; Also set SCIHOME to sensible XDG base dirs value. + (("\\.scilab-cli-bin-real\"") + (string-append + "scilab-cli-bin\" -scihome " + "\"${XDG_STATE_HOME:-$HOME/.local/state}/scilab/" + #$(package-version this-package) "\"")) (("export SCI=") "unset LANGUAGE\nexport SCI=")))))))) (home-page "https://www.scilab.org/")