b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #196464 from drupol/fish/improve-wrapper

Browse source
This commit is contained in:
Sandro 2022-10-19 00:33:21 +02:00 committed by GitHub
parent 702899fdb2 1f89b89ec8
commit 0056b11237
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/shells/fish/wrapper.nix
View file

@ -1,4 +1,4 @@
{ lib, writeShellScriptBin, fish, writeTextFile }:
{ lib, writeShellApplication, fish, writeTextFile }:
lib.makeOverridable ({
completionDirs ? [],
@ -6,7 +6,8 @@ lib.makeOverridable ({
confDirs ? [],
pluginPkgs ? [],
localConfig ? "",
shellAliases ? {}
shellAliases ? {},
runtimeInputs ? []
}:
let
@ -37,11 +38,15 @@ let
++ (map (vendorDir "conf") pluginPkgs)
++ (map (vendorDir "conf") [ localFishConfig shellAliasesFishConfig ]);
in writeShellScriptBin "fish" ''
${fish}/bin/fish --init-command "
set --prepend fish_complete_path ${lib.escapeShellArgs complPath}
set --prepend fish_function_path ${lib.escapeShellArgs funcPath}
set --local fish_conf_source_path ${lib.escapeShellArgs confPath}
for c in \$fish_conf_source_path/*; source \$c; end
" "$@"
'')
in writeShellApplication {
inherit runtimeInputs;
name = "fish";
text = ''
${fish}/bin/fish --init-command "
set --prepend fish_complete_path ${lib.escapeShellArgs complPath}
set --prepend fish_function_path ${lib.escapeShellArgs funcPath}
set --local fish_conf_source_path ${lib.escapeShellArgs confPath}
for c in \$fish_conf_source_path/*; source \$c; end
" "$@"
'';
})