From patchwork Tue Nov 8 09:47:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Prafulla Giri X-Patchwork-Id: 44396 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 57BA927BBEB; Tue, 8 Nov 2022 17:26:45 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 07D7927BBE9 for ; Tue, 8 Nov 2022 17:26:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1osSMn-0001B6-KP; Tue, 08 Nov 2022 12:26:29 -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 1osSLO-0000Ts-V1 for guix-patches@gnu.org; Tue, 08 Nov 2022 12:25:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1osSLO-0005EV-Mt for guix-patches@gnu.org; Tue, 08 Nov 2022 12:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1osSLO-0006W8-GS for guix-patches@gnu.org; Tue, 08 Nov 2022 12:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59127] [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export. Resent-From: Prafulla Giri Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Nov 2022 17:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59127 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59127@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.166792826924994 (code B ref -1); Tue, 08 Nov 2022 17:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Nov 2022 17:24:29 +0000 Received: from localhost ([127.0.0.1]:38110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osSKr-0006V2-0W for submit@debbugs.gnu.org; Tue, 08 Nov 2022 12:24:29 -0500 Received: from lists.gnu.org ([209.51.188.17]:55384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1osLDU-0002iU-Nb for submit@debbugs.gnu.org; Tue, 08 Nov 2022 04:48:25 -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 1osLDU-0005hy-CH for guix-patches@gnu.org; Tue, 08 Nov 2022 04:48:24 -0500 Received: from mail-40132.protonmail.ch ([185.70.40.132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1osLDO-0000iH-6T for guix-patches@gnu.org; Tue, 08 Nov 2022 04:48:24 -0500 Date: Tue, 08 Nov 2022 09:47:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1667900887; x=1668160087; bh=Bxp1SA47Gm5Iiu36Y+sS0+P1zsskfULwcLId+8gZ1kc=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=cbFHeL5TIT91a0yZRM3Ao1uop7NbTpakd/g+diNeGmLtYNtZ802MW5yWm3laQektm 6quuMiKFuXivM3iQFoNZuynCOzda5OJnLTFHgHz/oCHsdZ0RbRWWCZBGbARLKKoC4b UkL6AAHyRmw9+4igHhNhVJCdAtlJfLc/aB/ShLN8W7mUrzdsHEpUKL9/6VHE5R/v9s 1IMOii4chAagyT/DOlo7cnk9Eny0IUg86qGFbaLNCD/ehIYJ8cGpT++JIXdDttgddM kwInH5V9e9rC5ZVuboEaxhvKoP/Weizber7ulfPd6jTTF5UygnMYmNxeSP/VNLoPuS tsN2uh35wj4eA== Message-ID: Feedback-ID: 33818994:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.132; envelope-from=prafulla.giri@protonmail.com; helo=mail-40132.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 08 Nov 2022 12:24:27 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 08 Nov 2022 12:26:28 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Prafulla Giri X-ACL-Warn: , Prafulla Giri via Guix-patches X-Patchwork-Original-From: Prafulla Giri via Guix-patches via From: Prafulla Giri 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 Hello there, Here's a small patch. Regards. From 22a94cf122a8f01ba8078255031cc520f4f1b70d Mon Sep 17 00:00:00 2001 From: Prafulla Giri Date: Tue, 8 Nov 2022 13:39:21 +0545 Subject: [PATCH] guix-install.sh: remove unnecessary XDG_DATA_DIRS export. This started out as a bug-fix for a GUI login loop that was resulting from XDG_DATA_DIRS not including any of the host distro's directories. The solution was to export the vari- able (with fail-safe defaults) before source-ing GUIX_PROFILE/etc/profile. It turns out changes have already been made to ensure that XDG_DATA_DIRS, etc. are always exported before anything guix-specific. So, this export is no longer necessary. For reference, the aforementioned bug was found on a Debian 11 machine and it's guix.sh init profile for guix version 1.2. --- etc/guix-install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index c8ef59d4a4..21253f538b 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -10,6 +10,7 @@ # Copyright © 2021 Jakub Kądziołka # Copyright © 2021 Chris Marusich # Copyright © 2021, 2022 Maxim Cournoyer +# Copyright © 2019, 2020, 2022 Prafulla Giri # # This file is part of GNU Guix. # @@ -535,9 +536,6 @@ GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" export GUIX_LOCPATH [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" - -# set XDG_DATA_DIRS to include Guix installations -export XDG_DATA_DIRS="$GUIX_PROFILE/share:$XDG_DATA_DIRS" EOF } -- 2.38.0