From e8358125d98fc0128a02b7664f532447750fb930 Mon Sep 17 00:00:00 2001
From: meck <Johan@meck.se>
Date: Thu, 7 Jan 2021 14:46:03 +0100
Subject: [PATCH] fish: fix regression due to changes in Nixpkgs

Fixes #1701
Fixes #1702
---
 modules/programs/fish.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix
index 730afa79..f381960f 100644
--- 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]