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

Merge pull request #90670 from bouk/fish-no-tr

Browse Source 
fish: replace use of tr with string split
This commit is contained in:
Michele Guerini Rocco
2020-06-18 09:48:01 +02:00
committed by GitHub
parent 9480bae337 84e25cf478
commit b2532174e0
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,20 +79,17 @@ let
# additional profiles are expected in order of precedence, which means the reverse of the
# NIX_PROFILES variable (same as config.environment.profiles)
set -l __nix_profile_paths (echo $NIX_PROFILES | ${coreutils}/bin/tr ' ' '\n')[-1..1]
set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1]
set __extra_completionsdir \
set -p __extra_completionsdir \
$__nix_profile_paths"/etc/fish/completions" \
$__nix_profile_paths"/share/fish/vendor_completions.d" \
$__extra_completionsdir
set __extra_functionsdir \
$__nix_profile_paths"/share/fish/vendor_completions.d"
set -p __extra_functionsdir \
$__nix_profile_paths"/etc/fish/functions" \
$__nix_profile_paths"/share/fish/vendor_functions.d" \
$__extra_functionsdir
set __extra_confdir \
$__nix_profile_paths"/share/fish/vendor_functions.d"
set -p __extra_confdir \
$__nix_profile_paths"/etc/fish/conf.d" \
$__nix_profile_paths"/share/fish/vendor_conf.d" \
$__extra_confdir
$__nix_profile_paths"/share/fish/vendor_conf.d"
end
'';