Merge pull request #12422 from ilya-bobyr/fish-profile-use-set-local

nix-profile.fish: set --local NIX_LINK
NixOS · Feb 5, 2025 · d2425c5 · d2425c5
2 parents 3e8cd2f + 5030077
commit d2425c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/scripts/nix-profile-daemon.fish.in b/scripts/nix-profile-daemon.fish.in
@@ -24,7 +24,7 @@ end
 
 # Set up the per-user profile.
 
-set NIX_LINK $HOME/.nix-profile
+set --local NIX_LINK $HOME/.nix-profile
 
 # Set up environment.
 # This part should be kept in sync with nixpkgs:nixos/modules/programs/environment.nix
@@ -64,7 +64,6 @@ end
 
 add_path "@localstatedir@/nix/profiles/default/bin"
 add_path "$NIX_LINK/bin"
-set --erase NIX_LINK
 
 # Cleanup
 

diff --git a/scripts/nix-profile.fish.in b/scripts/nix-profile.fish.in
@@ -24,7 +24,7 @@ end
 
 # Set up the per-user profile.
 
-set NIX_LINK $HOME/.nix-profile
+set --local NIX_LINK $HOME/.nix-profile
 
 # Set up environment.
 # This part should be kept in sync with nixpkgs:nixos/modules/programs/environment.nix
@@ -63,7 +63,6 @@ if set --query MANPATH
 end
 
 add_path "$NIX_LINK/bin"
-set --erase NIX_LINK
 
 # Cleanup