-
-
Notifications
You must be signed in to change notification settings - Fork 14k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fish: add patch to fix
$PATH
for nix-darwin
- Loading branch information
Showing
2 changed files
with
27 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/share/config.fish b/share/config.fish | ||
index d85fd1e185..1d2b5dd598 100644 | ||
--- a/share/config.fish | ||
+++ b/share/config.fish | ||
@@ -156,7 +156,7 @@ | ||
# Some things should only be done for login terminals | ||
# This used to be in etc/config.fish - keep it here to keep the semantics | ||
# | ||
-if status --is-login | ||
+if status --is-login && not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE | ||
if command -sq /usr/libexec/path_helper | ||
# Adapt construct_path from the macOS /usr/libexec/path_helper | ||
# executable for fish; see |