diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-08-11 17:16:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-11 17:16:36 +0200 |
| commit | 12a7cc0d1fd50c3e9d82e94a57afce32c16ba83a (patch) | |
| tree | 76da42d0e8c5df92f8b7a84ffdd8e58f2918c59b /pkgs/misc/vim-plugins | |
| parent | 5002c9aedb4f80dba175690d5149f997ebd0a4a2 (diff) | |
| parent | 15bb6289d9900383b930672f473219f1e0344c36 (diff) | |
| download | nixpkgs-12a7cc0d1fd50c3e9d82e94a57afce32c16ba83a.tar nixpkgs-12a7cc0d1fd50c3e9d82e94a57afce32c16ba83a.tar.gz nixpkgs-12a7cc0d1fd50c3e9d82e94a57afce32c16ba83a.tar.bz2 nixpkgs-12a7cc0d1fd50c3e9d82e94a57afce32c16ba83a.tar.lz nixpkgs-12a7cc0d1fd50c3e9d82e94a57afce32c16ba83a.tar.xz nixpkgs-12a7cc0d1fd50c3e9d82e94a57afce32c16ba83a.tar.zst nixpkgs-12a7cc0d1fd50c3e9d82e94a57afce32c16ba83a.zip | |
Merge pull request #52685 from timokau/fzf-vim-dep
vimPlugins.fzf-vim: automatically add fzfWrapper
Diffstat (limited to 'pkgs/misc/vim-plugins')
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 7 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0281f9220e9..0c0a883f80a 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -33,6 +33,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; @@ -225,6 +228,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 { diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 14332c70078..2633c43d699 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, {}) ''); |