From c6efc0b255e19c93903d682b27119b38d1161a90 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Mon, 15 Feb 2021 22:35:20 +0100
Subject: [PATCH] wrapFish: fix singleton expansion in shell init
This fixes the expansion of the configuration path in the pathological
case of a singleton, which would otherwise be used verbatim with the
surrounding braces for lookup.
GitHub: see https://github.com/NixOS/nixpkgs/pull/108491#pullrequestreview-590072603
---
pkgs/shells/fish/wrapper.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/shells/fish/wrapper.nix b/pkgs/shells/fish/wrapper.nix
index 053568bc6b9..6713a69d560 100644
--- a/pkgs/shells/fish/wrapper.nix
+++ b/pkgs/shells/fish/wrapper.nix
@@ -14,12 +14,12 @@ let
complPath = completionDirs ++ map (vendorDir "completions") pluginPkgs;
funcPath = functionDirs ++ map (vendorDir "functions") pluginPkgs;
confPath = confDirs ++ map (vendorDir "conf") pluginPkgs;
- safeConfPath = map escapeShellArg confPath;
in writeShellScriptBin "fish" ''
${fish}/bin/fish --init-command "
set --prepend fish_complete_path ${escapeShellArgs complPath}
set --prepend fish_function_path ${escapeShellArgs funcPath}
- for c in {${concatStringsSep "," safeConfPath}}/*; source $c; end
+ set --local fish_conf_source_path ${escapeShellArgs confPath}
+ for c in $fish_conf_source_path/*; source $c; end
" "$@"
'')