aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThéophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>2022-10-18 09:50:05 +0200
committerGitHub <noreply@github.com>2022-10-18 09:50:05 +0200
commita324e9a5c84a144b824303064220463977c63c73 (patch)
treee85bf345b614e642c117a119d0e76f263b664aa2
parent3093bd3a855b8fa1f572fd5a33c1971adf5e3e08 (diff)
parent34e3fa3a4a012944ba7819659f5670a197885a2e (diff)
Merge pull request #7132 from stelcodes/fix-fish-manpath
Fix fish shell MANPATH creation
-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