wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 14:21:48 +02:00
Code Activity

nix-profile.sh.in: fix envvar condition

Browse source 
(cherry picked from commit 97fffd8765)

# Conflicts:
#	scripts/nix-profile.sh.in
This commit is contained in:
Noam Yorav-Raphael 2024-09-19 07:20:04 +03:00 • committed by Mergify
parent e0c8b0fc4f
commit 971748ace9
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/nix-profile.sh.in
View file

@ -1,11 +1,16 @@
# This file is tested by tests/installer/default.nix. # This file is tested by tests/installer/default.nix.
if [ -n "$HOME" ] && [ -n "$USER" ]; then if [ -n "${HOME-}" ] && [ -n "${USER-}" ]; then
# Set up the per-user profile. # Set up the per-user profile.
<<<<<<< HEAD
NIX_LINK="$HOME/.nix-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" NIX_LINK_NEW="$XDG_STATE_HOME/nix/profile"
=======
if [ -n "${NIX_STATE_HOME-}" ]; then
NIX_LINK="$NIX_STATE_HOME/profile"
>>>>>>> 97fffd876 (nix-profile.sh.in: fix envvar condition)
else else
NIX_LINK_NEW="$HOME/.local/state/nix/profile" NIX_LINK_NEW="$HOME/.local/state/nix/profile"
fi fi