From 4a860879ea76c2be86a696cb885cc51bfe8f61fa Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mcoudron@hotmail.com>
Date: Tue, 25 May 2021 22:37:57 +0200
Subject: wrapNeovimUnstable: accept a wrapRc boolean

additional argument not generated by makeNeovimConfig
If true (the default), appends "-u <customRc>" to the wrapped arguments.
Set to false if you want to control where to save the generated config
(e.g., in ~/.config/init.vim or project/.nvimrc)
---
 pkgs/test/vim/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'pkgs/test')

diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix
index 9128e1bcb11..c75836aa9a8 100644
--- a/pkgs/test/vim/default.nix
+++ b/pkgs/test/vim/default.nix
@@ -26,20 +26,18 @@ let
   wrapNeovim = suffix: config:
     wrapNeovimUnstable neovim-unwrapped (config // {
       extraName = suffix;
-      wrapperArgs = lib.escapeShellArgs (config.wrapperArgs ++
-        ["--add-flags" "-u ${writeText "init.vim" config.neovimRcContent}"]
-      );
+      wrapRc = true;
     });
 in
 {
   vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; };
 
   ### neovim tests
-  ##############3
+  ##################
   nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix;
 
   ### vim tests
-  ##############3
+  ##################
   vim_with_vim2nix = vim_configurable.customize {
     name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ];
   };
-- 
cgit 1.4.1