MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
vimPlugins.fzf-vim: automatically add fzfWrapper
This commit is contained in:
Maximilian Bosch 2019-08-11 17:16:36 +02:00 committed by GitHub
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 ];
};
# 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 {

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

@ -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, {})
'');