JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fish: avoid nontermination in fhs like setups

Browse Source
This commit is contained in:
Dominik Xaver Hörl 2020-12-20 14:42:30 +01:00 committed by Cole Helbling
parent 7ab270206f
commit cf3e8a7352
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/shells/fish/default.nix
View File

@ -56,8 +56,12 @@ let
# source both, but source the more global configuration files earlier
# than the more local ones, so that more local configurations inherit
# from but override the more global locations.
#
# Special care needs to be taken, when fish is called from an FHS user env
# or similar setup, because this configuration file will then be relocated
# to /etc/fish/config.fish, so we test for this case to avoid nontermination.
if test -f /etc/fish/config.fish
if test -f /etc/fish/config.fish && test /etc/fish/config.fish != (status filename)
source /etc/fish/config.fish
end