From 04de1306ba22e1b2147c4a8028e9209ffcd8884c Mon Sep 17 00:00:00 2001 From: toastal <561087+toastal@users.noreply.github.com> Date: Tue, 3 Aug 2021 11:52:20 +0000 Subject: [PATCH] vimPlugins.himalaya-vim: fix failing build (#132517) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- pkgs/misc/vim-plugins/overrides.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0ae30ec468b9..af0c6d4c806c 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -298,8 +298,12 @@ self: super: { himalaya-vim = buildVimPluginFrom2Nix { pname = "himalaya-vim"; inherit (himalaya) src version; - configurePhase = "cd vim/"; dependencies = with self; [ himalaya ]; + patchPhase = '' + rm -rf !"vim/" + cp -vaR vim/. . + rm -rf vim/ + ''; preFixup = '' substituteInPlace $out/share/vim-plugins/himalaya-vim/plugin/himalaya.vim \ --replace 'if !executable("himalaya")' 'if v:false'