vimPlugins.himalaya-vim: fix failing build (#132517)

* fix `himalaya-vim` failing build

I’m unsure as to why the configure phase `cd vim/` is no longer working, but
this patch phase copying files up a directory workaround is building for my
NixOS locally.

* consistent comment indentation

* Apply suggestions from code review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
toastal 2021-08-03 11:52:20 +00:00 committed by GitHub
parent 7067d12bb5
commit 04de1306ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -298,8 +298,12 @@ self: super: {
himalaya-vim = buildVimPluginFrom2Nix { himalaya-vim = buildVimPluginFrom2Nix {
pname = "himalaya-vim"; pname = "himalaya-vim";
inherit (himalaya) src version; inherit (himalaya) src version;
configurePhase = "cd vim/";
dependencies = with self; [ himalaya ]; dependencies = with self; [ himalaya ];
patchPhase = ''
rm -rf !"vim/"
cp -vaR vim/. .
rm -rf vim/
'';
preFixup = '' preFixup = ''
substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \ substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \
--replace 'if !executable("himalaya")' 'if v:false' --replace 'if !executable("himalaya")' 'if v:false'