Merge pull request #7921 from NixOS/backport-7920-to-2.14-maintenance

[Backport 2.14-maintenance] nix-profile{,-daemon}.sh.in: Allow XDG_STATE_HOME to be unset
NixOS · Mar 1, 2023 · 70d01bd · 70d01bd
2 parents 892b699 + 9ccd835
commit 70d01bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in
@@ -3,7 +3,7 @@ if [ -n "${__ETC_PROFILE_NIX_SOURCED:-}" ]; then return; fi
 __ETC_PROFILE_NIX_SOURCED=1
 
 NIX_LINK=$HOME/.nix-profile
-if [ -n "$XDG_STATE_HOME" ]; then
+if [ -n "${XDG_STATE_HOME-}" ]; then
     NIX_LINK_NEW="$XDG_STATE_HOME/nix/profile"
 else
     NIX_LINK_NEW=$HOME/.local/state/nix/profile

diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
@@ -3,7 +3,7 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
     # Set up the per-user profile.
 
     NIX_LINK="$HOME/.nix-profile"
-    if [ -n "$XDG_STATE_HOME" ]; then
+    if [ -n "${XDG_STATE_HOME-}" ]; then
         NIX_LINK_NEW="$XDG_STATE_HOME/nix/profile"
     else
         NIX_LINK_NEW="$HOME/.local/state/nix/profile"