Merge pull request #80657 from brettlyons/patch-1

vimPlugins.notational-fzf-vim: patch plugin to fix missing runtime dependency
This commit is contained in:
Timo Kaufmann 2020-02-25 00:42:06 +00:00 committed by GitHub
commit b8a00580d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -28,6 +28,9 @@
# vCoolor dependency # vCoolor dependency
, gnome3 , gnome3
# notational-fzf-vim dependencies
, ripgrep
}: }:
self: super: { self: super: {
@ -250,6 +253,17 @@ self: super: {
dependencies = with super; [ ultisnips ]; dependencies = with super; [ ultisnips ];
}); });
notational-fzf-vim = super.notational-fzf-vim.overrideAttrs(old: {
dependencies = with self; [ fzf-vim ];
patchPhase = ''
substituteInPlace plugin/notational_fzf.vim \
--replace "'rg'" "'${ripgrep}/bin/rg'" \
--replace \
"let s:python_executable = executable('pypy3') ? 'pypy3' : 'python3'" \
"let s:python_executable = '${python3}/bin/python3'"
'';
});
fzf-vim = super.fzf-vim.overrideAttrs(old: { fzf-vim = super.fzf-vim.overrideAttrs(old: {
dependencies = [ self.fzfWrapper ]; dependencies = [ self.fzfWrapper ];
}); });