summary refs log tree commit diff
path: root/etc/guix-install.sh
diff options
context:
space:
mode:
authorPrafulla Giri <prafulla.giri@protonmail.com>2022-11-08 13:39:21 +0545
committer宋文武 <iyzsong@member.fsf.org>2022-11-14 10:25:45 +0800
commit775134ebf537895bcb7bf2a6c541846845403737 (patch)
tree12c1e5384208dc909872e723f1c4642b7a526b63 /etc/guix-install.sh
parent3ff0a976e8f9e3792b39b5968cb9ff066eb4ba60 (diff)
downloadguix-775134ebf537895bcb7bf2a6c541846845403737.tar.gz
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: 宋文武 <iyzsong@member.fsf.org>
Diffstat (limited to 'etc/guix-install.sh')
-rwxr-xr-xetc/guix-install.sh4
1 files changed, 1 insertions, 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 <kuba@kadziolka.net>
 # Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
 # Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+# Copyright © 2022 Prafulla Giri <prafulla.giri@protonmail.com>
 #
 # 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
 }