nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-25 19:51:00 +01:00
Code Activity

Check if NIX_LINK_NEW exists instead of checking that NIX_LINK doesn't exist

Browse source 
For brand new installations, neither NIX_LINK_NEW
(`$XDG_STATE_HOME/nix/profile` or `~/.local/state/nix/profile`), nor
NIX_LINK (`~/.nix-profile`) will exist.

This restores functionality to nix-env, which is relied upon by GitHub
Actions such as https://github.com/cachix/cachix-action and the Nixpkgs
EditorConfig (and other) CI.

(cherry picked from commit 2b801d6e3c)
This commit is contained in:
Cole Helbling 2023-02-28 16:10:42 -08:00 • committed by github-actions[bot]
parent 71a619642d
commit f53b3c8c14
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/nix-profile-daemon.sh.in
View file

@ -8,7 +8,7 @@ if [ -n "$XDG_STATE_HOME" ]; then
else
NIX_LINK_NEW=$HOME/.local/state/nix/profile
fi
if ! [ -e "$NIX_LINK" ]; then
if [ -e "$NIX_LINK_NEW" ]; then
NIX_LINK="$NIX_LINK_NEW"
else
if [ -t 2 ] && [ -e "$NIX_LINK_NEW" ]; then

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

@ -8,7 +8,7 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
else
NIX_LINK_NEW="$HOME/.local/state/nix/profile"
fi
if ! [ -e "$NIX_LINK" ]; then
if [ -e "$NIX_LINK_NEW" ]; then
NIX_LINK="$NIX_LINK_NEW"
else
if [ -t 2 ] && [ -e "$NIX_LINK_NEW" ]; then