From patchwork Sun Sep 10 17:43:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 53705 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 E8B2627BBEC; Sun, 10 Sep 2023 18:45:15 +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 38F0927BBE9 for ; Sun, 10 Sep 2023 18:45:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfOUd-00069F-F3; Sun, 10 Sep 2023 13:45:09 -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 1qfOUX-00068w-Ln for guix-patches@gnu.org; Sun, 10 Sep 2023 13:45:02 -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 1qfOUX-0008Sj-7C for guix-patches@gnu.org; Sun, 10 Sep 2023 13:45:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfOUY-0004vL-NM; Sun, 10 Sep 2023 13:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65857] [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs. 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:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-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.169436786218846 (code B ref -1); Sun, 10 Sep 2023 17:45:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Sep 2023 17:44:22 +0000 Received: from localhost ([127.0.0.1]:51255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOTu-0004tu-IM for submit@debbugs.gnu.org; Sun, 10 Sep 2023 13:44:22 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOTp-0004tQ-Tf 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-0005un-7s for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:06 -0400 Received: from 17.mo584.mail-out.ovh.net ([46.105.41.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfOTa-0008Lt-Bg for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:04 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.143.208]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id DB48A24C91 for ; Sun, 10 Sep 2023 17:43:59 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gnmzv (unknown [10.111.208.242]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7A9A61FE57; Sun, 10 Sep 2023 17:43:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-6684bf9d7b-gnmzv with ESMTPSA id JpF9GF8A/mS/xQAA0nGNIQ (envelope-from ); Sun, 10 Sep 2023 17:43:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R00603ff465c-1246-4bc5-b306-fa3ac976e8ca, 093A30F52D67F1E631810F39359834EEDB6571F2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.132.86 Date: Sun, 10 Sep 2023 19:43:41 +0200 Message-ID: <43ba8c457ebc2994c1b53ce020fd0e1423783e4c.1694367821.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <6d38ad3f36cb03c4ae6d715edcb741b5602a2997.1694367821.git.ngraves@ngraves.fr> References: <6d38ad3f36cb03c4ae6d715edcb741b5602a2997.1694367821.git.ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 26740123832607458 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudeivddgudduhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekkeegveekffduleevveevkeejteekgfdtjeehgfefvddvffdvfeffjedugfffgfenucffohhmrghinhepshgtihhlrggsrdhorhhgnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufedvrdekiedpfeejrdehledrudegvddruddtieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=46.105.41.16; envelope-from=ngraves@ngraves.fr; helo=17.mo584.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_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 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(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 900a9f0fac..8162ab95d1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8553,7 +8553,14 @@ (define-public scilab "/bin/dirname")) (("basename") #$(file-append (this-package-input "coreutils") - "/bin/basename")))))))) + "/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}/scilab\"")))))))) (home-page "https://scilab.org") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab