diff options
| -rw-r--r-- | pkgs/applications/editors/neovim/utils.nix | 17 | ||||
| -rw-r--r-- | pkgs/test/vim/default.nix | 9 |
2 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index a7d8f00c664f..ae814fa9b4eb 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -54,15 +54,7 @@ let configurePatched = configure // { - packages.nix = { - start = lib.filter (f: f != null) - (map (x: if x.optional == false then x.plugin else null) - pluginsNormalized); - opt = lib.filter (f: f != null) - (map (x: if x.optional == true then x.plugin else null) - pluginsNormalized); - }; - customRC = pluginRc + customRC; + customRC = pluginRc + customRC + (configure.customRC or ""); }; # A function to get the configuration string (if any) from an element of 'plugins' @@ -173,11 +165,8 @@ let assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; wrapNeovimUnstable neovim (res // { - wrapperArgs = lib.escapeShellArgs ( - res.wrapperArgs ++ lib.optionals (configure != {}) [ - "--add-flags" "-u ${writeText "init.vim" res.neovimRcContent}" - ]) + " " + extraMakeWrapperArgs - ; + wrapperArgs = lib.escapeShellArgs res.wrapperArgs + extraMakeWrapperArgs; + wrapRc = (configure != {}); }); in { diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index c75836aa9a80..c809940fc4c7 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -36,6 +36,15 @@ in ################## nvim_with_plugins = wrapNeovim "-with-plugins" nvimConfNix; + nvim_via_override = neovim.override { + configure = { + packages.foo.start = [ vimPlugins.ale ]; + customRC = '' + :help ale + ''; + }; + }; + ### vim tests ################## vim_with_vim2nix = vim_configurable.customize { |