buildNeovimPluginFrom2Nix: use neovimRequireCheckHook

and removed the addRtp call that was breaking overrideAttrs

pkgs/applications/editors/vim/plugins/build-vim-plugin.nix

@@ -7,11 +7,6 @@
 }:
 
 rec {
-  addRtp = path: attrs: derivation:
-    derivation // { rtp = "${derivation}"; } // {
-      overrideAttrs = f: buildVimPlugin (attrs // f attrs);
-    };
-
   buildVimPlugin = attrs@{
     name ? "${attrs.pname}-${attrs.version}",
     namePrefix ? "vimplugin-",
@@ -25,14 +20,14 @@ rec {
     addonInfo ? null,
     ...
   }:
-    addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // {
+    (stdenv.mkDerivation (attrs // {
       name = namePrefix + name;
 
       # dont move the doc folder since vim expects it
       forceShare= [ "man" "info" ];
 
       nativeBuildInputs = attrs.nativeBuildInputs or []
-      ++ [ vimCommandCheckHook neovimRequireCheckHook ]
+      ++ [ vimCommandCheckHook ]
       ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook;
       inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall;
 

pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh

@@ -9,7 +9,7 @@ neovimRequireCheckHook () {
 
 		# editorconfig-checker-disable
         export HOME="$TMPDIR"
-        @nvimBinary@ -es -n -u NONE -i NONE --clean -V1 \
+        @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \
             --cmd "set rtp+=$out" \
             --cmd "lua require('$nvimRequireCheck')"
     fi

pkgs/applications/editors/vim/plugins/vim-utils.nix

@@ -548,7 +548,9 @@ rec {
 
   # TODO placeholder to ease working on automatic plugin detection
   # this should be a luarocks "flat" install with appropriate vim hooks
-  buildNeovimPluginFrom2Nix = buildVimPluginFrom2Nix;
+  buildNeovimPluginFrom2Nix = attrs: let drv = (buildVimPluginFrom2Nix attrs); in drv.overrideAttrs(oa: {
+    nativeBuildInputs = oa.nativeBuildInputs ++ [ neovimRequireCheckHook ];
+  });
 
   # used to figure out which python dependencies etc. neovim needs
   requiredPlugins = {