fish: fix regression due to changes in Nixpkgs

Fixes #1701 Fixes #1702
2021-01-07 14:46:03 +01:00 · 2021-01-07 14:46:03 +01:00 · e8358125d9
parent cb1ed0d2f3
commit e8358125d9
1 changed files with 6 additions and 1 deletions
--- a/modules/programs/fish.nix
+++ b/modules/programs/fish.nix
@ -343,7 +343,12 @@ in {
        # if we haven't sourced the general config, do it
        if not set -q __fish_general_config_sourced

-          set -p fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions
+          set --prepend fish_function_path ${
+            if pkgs ? fishPlugins && pkgs.fishPlugins ? foreign-env then
+              "${pkgs.fishPlugins.foreign-env}/share/fish/vendor_functions.d"
+            else
+              "${pkgs.fish-foreign-env}/share/fish-foreign-env/functions"
+          }
          fenv source ${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh > /dev/null
          set -e fish_function_path[1]