summary refs log tree commit diff
path: root/pkgs/misc/vim-plugins/overrides.nix
diff options
context:
space:
mode:
authortoastal <toastal@posteo.net>2021-09-06 16:23:03 +0700
committertoastal <toastal@posteo.net>2021-09-06 16:23:03 +0700
commit99e969ab15023d5a9565c8b6acd5575520d48abd (patch)
tree4c2e0996ef7a9cb8dc83b52159db8bf76cfc631b /pkgs/misc/vim-plugins/overrides.nix
parentc8cd39a4ca025236efb7fe4011cfd88a2081578e (diff)
downloadnixpkgs-99e969ab15023d5a9565c8b6acd5575520d48abd.tar
nixpkgs-99e969ab15023d5a9565c8b6acd5575520d48abd.tar.gz
nixpkgs-99e969ab15023d5a9565c8b6acd5575520d48abd.tar.bz2
nixpkgs-99e969ab15023d5a9565c8b6acd5575520d48abd.tar.lz
nixpkgs-99e969ab15023d5a9565c8b6acd5575520d48abd.tar.xz
nixpkgs-99e969ab15023d5a9565c8b6acd5575520d48abd.tar.zst
nixpkgs-99e969ab15023d5a9565c8b6acd5575520d48abd.zip
himalaya-vim: fix broken build
I think something about the build for Vim plugins has changed that made
this build break. Moving the fixup step up to configure made it build
again on my local machine.
Diffstat (limited to 'pkgs/misc/vim-plugins/overrides.nix')
-rw-r--r--pkgs/misc/vim-plugins/overrides.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 22adcb74316..f52d708359f 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -51,7 +51,7 @@
 , CoreFoundation
 , CoreServices
 
-# nvim-treesitter dependencies
+  # nvim-treesitter dependencies
 , tree-sitter
 
   # sved dependencies
@@ -66,7 +66,7 @@
 , openssl
 , pkg-config
 
-# vim-go dependencies
+  # vim-go dependencies
 , asmfmt
 , delve
 , errcheck
@@ -86,7 +86,7 @@
 , iferr
 , impl
 , reftools
-# must be lua51Packages
+  # must be lua51Packages
 , luaPackages
 }:
 
@@ -311,13 +311,9 @@ self: super: {
     pname = "himalaya-vim";
     inherit (himalaya) src version;
     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 \
+    configurePhase = ''
+      cd vim
+      substituteInPlace plugin/himalaya.vim \
         --replace 'if !executable("himalaya")' 'if v:false'
     '';
     postFixup = ''