wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 19:01:16 +02:00
Code Activity

Resolve conflict

Browse source 
Some of the code before https://github.com/NixOS/nix/pull/11351 did not
have the problem. What remains wasn't all that problematic, but is good
to have anyway.
This commit is contained in:
Robert Hensing 2025-01-12 13:15:03 +01:00
parent 971748ace9
commit a69d32d194
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,14 +3,9 @@ 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