From patchwork Thu Sep 28 19:05:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 54378 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 61B9727BBEA; Thu, 28 Sep 2023 20:06:05 +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=ham 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 AF48827BBE2 for ; Thu, 28 Sep 2023 20:06:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlwKm-0007z9-Bb; Thu, 28 Sep 2023 15:06: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 1qlwKd-0007yZ-Pu for guix-patches@gnu.org; Thu, 28 Sep 2023 15:05:57 -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 1qlwKc-0005uZ-Bg for guix-patches@gnu.org; Thu, 28 Sep 2023 15:05:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlwKo-0007up-75; Thu, 28 Sep 2023 15:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65857] [PATCH v2] gnu: scilab: Set SCIHOME default to respect XDG base dirs. References: <43ba8c457ebc2994c1b53ce020fd0e1423783e4c.1694367821.git.ngraves@ngraves.fr> In-Reply-To: <43ba8c457ebc2994c1b53ce020fd0e1423783e4c.1694367821.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:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65857 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65857@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 65857-submit@debbugs.gnu.org id=B65857.169592794930406 (code B ref 65857); Thu, 28 Sep 2023 19:06:02 +0000 Received: (at 65857) by debbugs.gnu.org; 28 Sep 2023 19:05:49 +0000 Received: from localhost ([127.0.0.1]:54512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlwKU-0007uE-Pn for submit@debbugs.gnu.org; Thu, 28 Sep 2023 15:05:49 -0400 Received: from 3.mo584.mail-out.ovh.net ([46.105.57.129]:58293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlwKR-0007u3-02 for 65857@debbugs.gnu.org; Thu, 28 Sep 2023 15:05:41 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.16.29]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 54B9727263 for <65857@debbugs.gnu.org>; Thu, 28 Sep 2023 19:05:23 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-b9c2b (unknown [10.110.103.49]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1BA571FE3C; Thu, 28 Sep 2023 19:05:23 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-6684bf9d7b-b9c2b with ESMTPSA id JvsTA3POFWUmDQAAIm8LJw (envelope-from ); Thu, 28 Sep 2023 19:05:23 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R0064c550bd8-0b24-4adf-95fb-4e9341b03038, 57906430550E741FE59AD178AEB9473F26373A74) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Thu, 28 Sep 2023 21:05:06 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 14876233997279421154 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrtddtgddutddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepffetjeehuddvvdekfffhffeifeefteefleektedtkedvkeegtddtveejveelkedtnecuffhomhgrihhnpehhohhmvgdrlhhotggrlhdpshgtihhlrggsrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheekheejseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth 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 SCIHOME default to respect XDG base dirs. [arguments](phases): Add phase respect-xdg-base-dirs. --- gnu/packages/maths.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) base-commit: f9784991eb6c7ec1a20f76d080873a3319be0908 prerequisite-patch-id: 5ec00d550739652cba67dc8663fbde73ff268491 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f7e1de41f3..580d98417c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8533,7 +8533,14 @@ (define-public scilab (("dirname") (search-inputs-file #$inputs "/bin/dirname")) (("basename") - (search-inputs-file #$inputs "/bin/basename")))))))) + (search-inputs-file #$inputs "/bin/basename"))))) + (add-after 'hardcode-script-inputs 'respect-xdg-base-dirs + (lambda _ + (substitute* (string-append #$output "/bin/scilab") + (("IS_SCILAB_BINARY=0" all) + (string-append all + "\n[ -n \"$SCIHOME\" ] &&\ + SCIHOME=\"${XDG_STATE_HOME:$HOME/.local/state}/scilab\"")))))))) (home-page "https://scilab.org") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab