From b2df781d90f728a068bbd97f4171e81517a5c4eb Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:06:56 +0100
Subject: [PATCH] neovim: fixed luasnip test + simplify code

let's not use vimrcContent that is effectively the identity in our context.
---
 pkgs/applications/editors/neovim/tests/default.nix | 1 -
 pkgs/applications/editors/neovim/wrapper.nix       | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix
index 7448d9d17ceb..c6579c9ad17b 100644
--- a/pkgs/applications/editors/neovim/tests/default.nix
+++ b/pkgs/applications/editors/neovim/tests/default.nix
@@ -364,7 +364,6 @@ in
   # for instance luasnip has a dependency on jsregexp
   can_require_transitive_deps =
     runTest nvim-with-luasnip ''
-    cat ${nvim-with-luasnip}/nvim
     ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e +quitall!
   '';
 
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index 47795ac8954b..66f219680e5b 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -84,13 +84,9 @@ let
     pluginRC = lib.foldl (acc: p: if p.config != null then acc ++ [p.config] else acc) []  pluginsNormalized;
 
     # a limited RC script used only to generate the manifest for remote plugins
-    manifestRc = vimUtils.vimrcContent { customRC = ""; };
+    manifestRc = "";
     # we call vimrcContent without 'packages' to avoid the init.vim generation
-    neovimRcContent' = vimUtils.vimrcContent {
-      beforePlugins = "";
-      customRC = lib.concatStringsSep "\n" (pluginRC ++ lib.optional (neovimRcContent != null) neovimRcContent);
-      packages = null;
-    };
+    neovimRcContent' = lib.concatStringsSep "\n" (pluginRC ++ lib.optional (neovimRcContent != null) neovimRcContent);
 
     packpathDirs.myNeovimPackages = myVimPackage;
     finalPackdir = neovimUtils.packDir packpathDirs;