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

Merge pull request #52685 from timokau/fzf-vim-dep 

vimPlugins.fzf-vim: automatically add fzfWrapper
This commit is contained in:
Maximilian Bosch 2019-08-11 17:16:36 +02:00 committed by GitHub
parent 5002c9aedb 15bb6289d9
commit 12a7cc0d1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/misc/vim-plugins/overrides.nix
View File

@ -33,6 +33,9 @@ self: super: {
dependencies = with super; [ vim-addon-manager ]; 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 { fzfWrapper = buildVimPluginFrom2Nix {
pname = "fzf"; pname = "fzf";
version = fzf.version; version = fzf.version;
@ -225,6 +228,10 @@ self: super: {
dependencies = with super; [ ultisnips ]; dependencies = with super; [ ultisnips ];
}); });
fzf-vim = super.fzf-vim.overrideAttrs(old: {
dependencies = [ self.fzfWrapper ];
});
sved = let sved = let
# we put the script in its own derivation to benefit the magic of wrapGAppsHook # we put the script in its own derivation to benefit the magic of wrapGAppsHook
svedbackend = stdenv.mkDerivation { svedbackend = stdenv.mkDerivation {

2
pkgs/misc/vim-plugins/vim-utils.nix
View File

@ -291,7 +291,7 @@ let
" tell vam about which plugins to load when: " tell vam about which plugins to load when:
let l = [] 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, {}) call vam#Scripts(l, {})
''); '');