From d55e92dd2e8fe0e1bc7ffe9cd1a6abc2034d3b6b Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 19 Feb 2019 12:51:16 +0100
Subject: [PATCH 1/2] vimPlugins.fzf-vim: add fzfWrapper dependency

fzfWrapper is needed for fzf-vim to work.
---
 pkgs/misc/vim-plugins/overrides.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 8b7789cf622..0753e8c3566 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -27,6 +27,9 @@ self: super: {
     dependencies = with super; [ vim-addon-manager ];
   };
 
+  # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim
+  # plugin, since part of the fzf vim plugin is included in the main fzf
+  # program.
   fzfWrapper = buildVimPluginFrom2Nix {
     pname = "fzf";
     version = fzf.version;
@@ -173,6 +176,10 @@ self: super: {
     dependencies = with super; [ ultisnips ];
   });
 
+  fzf-vim = super.fzf-vim.overrideAttrs(old: {
+    dependencies = [ self.fzfWrapper ];
+  });
+
   sved = let
     # we put the script in its own derivation to benefit the magic of wrapGAppsHook
     svedbackend = stdenv.mkDerivation {

From 15bb6289d9900383b930672f473219f1e0344c36 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 19 Feb 2019 18:09:37 +0100
Subject: [PATCH 2/2] vimPlugins: fix vam dependency handling

---
 pkgs/misc/vim-plugins/vim-utils.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 2a758aa9843..a6802a100bf 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -291,7 +291,7 @@ let
 
         " tell vam about which plugins to load when:
         let l = []
-        ${lib.concatMapStrings (p: "call add(l, ${toNix p})\n") vam.pluginDictionaries}
+        ${lib.concatMapStrings (p: "call add(l, {'name': '${p.pname}'})\n") plugins}
         call vam#Scripts(l, {})
       '');