From 801e33f56288bbbac28acdfe783e9229441fb9a8 Mon Sep 17 00:00:00 2001 From: Yusup <72071763+name-snrl@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:04:15 +0500 Subject: [PATCH] neovim: pass wrapper args only once (#257136) --- pkgs/applications/editors/neovim/wrapper.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 2352cdb82a44..0fbb54df01ac 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -39,11 +39,9 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - # "--add-flags" (lib.escapeShellArgs flags) - # wrapper args used both when generating the manifest and in the final neovim executable - commonWrapperArgs = (lib.optionals (lib.isList wrapperArgs) wrapperArgs) + commonWrapperArgs = # vim accepts a limited number of commands so we join them all - ++ [ + [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' # (lib.intersperse "|" hostProviderViml) ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [