forked from mirrors/nixpkgs
Merge pull request #136872 from toastal/himalaya-vim-fix
himalaya-vim: fix broken build
This commit is contained in:
commit
732a626091
|
@ -51,7 +51,7 @@
|
||||||
, CoreFoundation
|
, CoreFoundation
|
||||||
, CoreServices
|
, CoreServices
|
||||||
|
|
||||||
# nvim-treesitter dependencies
|
# nvim-treesitter dependencies
|
||||||
, tree-sitter
|
, tree-sitter
|
||||||
|
|
||||||
# sved dependencies
|
# sved dependencies
|
||||||
|
@ -66,7 +66,7 @@
|
||||||
, openssl
|
, openssl
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
|
||||||
# vim-go dependencies
|
# vim-go dependencies
|
||||||
, asmfmt
|
, asmfmt
|
||||||
, delve
|
, delve
|
||||||
, errcheck
|
, errcheck
|
||||||
|
@ -86,7 +86,7 @@
|
||||||
, iferr
|
, iferr
|
||||||
, impl
|
, impl
|
||||||
, reftools
|
, reftools
|
||||||
# must be lua51Packages
|
# must be lua51Packages
|
||||||
, luaPackages
|
, luaPackages
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -311,13 +311,9 @@ self: super: {
|
||||||
pname = "himalaya-vim";
|
pname = "himalaya-vim";
|
||||||
inherit (himalaya) src version;
|
inherit (himalaya) src version;
|
||||||
dependencies = with self; [ himalaya ];
|
dependencies = with self; [ himalaya ];
|
||||||
patchPhase = ''
|
configurePhase = ''
|
||||||
rm -rf !"vim/"
|
cd vim
|
||||||
cp -vaR vim/. .
|
substituteInPlace plugin/himalaya.vim \
|
||||||
rm -rf vim/
|
|
||||||
'';
|
|
||||||
preFixup = ''
|
|
||||||
substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \
|
|
||||||
--replace 'if !executable("himalaya")' 'if v:false'
|
--replace 'if !executable("himalaya")' 'if v:false'
|
||||||
'';
|
'';
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
|
Loading…
Reference in a new issue