This is an automated email from the git hooks/post-receive script.
iyzsong pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 775134ebf5 guix-install.sh: Remove unnecessary XDG_DATA_DIRS export.
775134ebf5 is described below
commit 775134ebf537895bcb7bf2a6c541846845403737
Author: Prafulla Giri <[email protected]>
AuthorDate: Tue Nov 8 13:39:21 2022 +0545
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 (sys_create_init_profile): Remove unnecessary
XDG_DATA_DIRS export.
Signed-off-by: 宋文武 <[email protected]>
---
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 6cb4d145e1..88ca0e61ea 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -10,6 +10,7 @@
# Copyright © 2021 Jakub Kądziołka <[email protected]>
# Copyright © 2021 Chris Marusich <[email protected]>
# Copyright © 2021, 2022 Maxim Cournoyer <[email protected]>
+# Copyright © 2022 Prafulla Giri <[email protected]>
#
# 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
}
