diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-17 00:36:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 00:36:34 +0000 |
| commit | 3e0ef2752afff17fb4547c8731d9b1cb3606c98d (patch) | |
| tree | 590652002acbddc6ab30a32b8ed9fcdc5f530983 /pkgs/shells | |
| parent | c0f4dcb71deb2b1bd0ad27467b379f608f2db513 (diff) | |
| parent | 79b7a67b55ee7f22a796720643ec8b1b65b2f8ed (diff) | |
| download | nixpkgs-3e0ef2752afff17fb4547c8731d9b1cb3606c98d.tar nixpkgs-3e0ef2752afff17fb4547c8731d9b1cb3606c98d.tar.gz nixpkgs-3e0ef2752afff17fb4547c8731d9b1cb3606c98d.tar.bz2 nixpkgs-3e0ef2752afff17fb4547c8731d9b1cb3606c98d.tar.lz nixpkgs-3e0ef2752afff17fb4547c8731d9b1cb3606c98d.tar.xz nixpkgs-3e0ef2752afff17fb4547c8731d9b1cb3606c98d.tar.zst nixpkgs-3e0ef2752afff17fb4547c8731d9b1cb3606c98d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/fish/wrapper.nix | 4 |
1 files 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 " "$@" '') |