aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonrad Hinsen <konrad.hinsen@fastmail.net>2021-12-30 09:39:31 +0100
committerMathieu Othacehe <othacehe@gnu.org>2022-11-08 10:55:54 +0100
commit93be56a3ab28ed0a482f354b7f536681c99b6999 (patch)
tree1c30d59a96400b1888695d73a8e147446e1bd9b2
parent0e69ee46cc19396c40022971c8000b8e528f3747 (diff)
downloadguix-93be56a3ab28ed0a482f354b7f536681c99b6999.tar.gz
guix-93be56a3ab28ed0a482f354b7f536681c99b6999.zip
guix-install.sh: Run guix.sh script in /etc/profile.d last.
* etc/guix-install.sh: Rename /etc/profile.d/guix.sh to zzz-guix.sh. This script refers to environment variables set by the host distribution. They may be set in other scripts in /etc/profile.d, which must therefore be run first. Example: in Ubuntu 20.04, XDG_DATA_DIRS is set in /etc/profile.d/xdg_dirs_desktop_session.sh Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
-rwxr-xr-xetc/guix-install.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index c8ef59d4a4..6cb4d145e1 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -506,7 +506,7 @@ sys_create_init_profile()
{ # Define for better desktop integration
# This will not take effect until the next shell or desktop session!
[ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case
- cat <<"EOF" > /etc/profile.d/guix.sh
+ cat <<"EOF" > /etc/profile.d/zzz-guix.sh
# Explicitly initialize XDG base directory variables to ease compatibility
# with Guix System: see <https://issues.guix.gnu.org/56050#3>.
export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"