aboutsummaryrefslogtreecommitdiff
path: root/scripts/nix-profile.fish.in
diff options
context:
space:
mode:
authorThéophane Hufschmitt <theophane.hufschmitt@tweag.io>2022-11-14 15:00:05 +0100
committerThéophane Hufschmitt <theophane.hufschmitt@tweag.io>2022-11-14 15:00:05 +0100
commit8b4352d79b488a82321254b7ab531ff977816361 (patch)
tree50e0dfb0d22b82d49b82aac0cd7b80f5482deada /scripts/nix-profile.fish.in
parente7ed9ae0c711c4efd83756b16379549ecff52355 (diff)
parent302ddee749f1341895b3f18c7f430dfc13171985 (diff)
Merge remote-tracking branch 'nixos/master' into readFile-scan-references
Diffstat (limited to 'scripts/nix-profile.fish.in')
-rw-r--r--scripts/nix-profile.fish.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/nix-profile.fish.in b/scripts/nix-profile.fish.in
index 59d247771..8d783d7c0 100644
--- a/scripts/nix-profile.fish.in
+++ b/scripts/nix-profile.fish.in
@@ -28,7 +28,9 @@ if test -n "$HOME" && test -n "$USER"
# Only use MANPATH if it is already set. In general `man` will just simply
# pick up `.nix-profile/share/man` because is it close to `.nix-profile/bin`
# which is in the $PATH. For more info, run `manpath -d`.
- set --export --prepend --path MANPATH "$NIX_LINK/share/man"
+ if set --query MANPATH
+ set --export --prepend --path MANPATH "$NIX_LINK/share/man"
+ end
fish_add_path --prepend --global "$NIX_LINK/bin"
set --erase NIX_LINK