From cf3e8a7352ebcc83b45c800c9e3ca759804b2676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Sun, 20 Dec 2020 14:42:30 +0100 Subject: [PATCH] fish: avoid nontermination in fhs like setups --- pkgs/shells/fish/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 7e38d9dec3a1..e36e32d043f8 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -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