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