···148148 , vimAlias ? false
149149 , viAlias ? false
150150 , configure ? {}
151151+ , extraName ? ""
151152 }:
152153 let
153154 /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */
···160161 extraPython3Packages = compatFun extraPython3Packages;
161162 inherit withNodeJs withRuby viAlias vimAlias;
162163 inherit configure;
164164+ inherit extraName;
163165 };
164166 in
165167 assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages.";
+16-12
pkgs/applications/editors/neovim/wrapper.nix
···2727 # set to false if you want to control where to save the generated config
2828 # (e.g., in ~/.config/init.vim or project/.nvimrc)
2929 , wrapRc ? true
3030+ , neovimRcContent ? ""
3031 , ...
3132 }@args:
3233 let
33343435 wrapperArgsStr = if isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs;
35363636- # If configure != {}, we can't generate the rplugin.vim file with e.g
3737- # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in
3838- # the wrapper. That's why only when configure != {} (tested both here and
3939- # when postBuild is evaluated), we call makeWrapper once to generate a
4040- # wrapper with most arguments we need, excluding those that cause problems to
4141- # generate rplugin.vim, but still required for the final wrapper.
4242- finalMakeWrapperArgs =
4343- [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ]
4444- ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]
4545- ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" args.neovimRcContent}" ]
4646- ;
3737+ # If configure != {}, we can't generate the rplugin.vim file with e.g
3838+ # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in
3939+ # the wrapper. That's why only when configure != {} (tested both here and
4040+ # when postBuild is evaluated), we call makeWrapper once to generate a
4141+ # wrapper with most arguments we need, excluding those that cause problems to
4242+ # generate rplugin.vim, but still required for the final wrapper.
4343+ finalMakeWrapperArgs =
4444+ [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ]
4545+ ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ]
4646+ ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ]
4747+ ;
4748 in
4849 assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env.";
4950···116117 preferLocalBuild = true;
117118118119 nativeBuildInputs = [ makeWrapper ];
119119- passthru = { unwrapped = neovim; };
120120+ passthru = {
121121+ unwrapped = neovim;
122122+ initRc = neovimRcContent;
123123+ };
120124121125 meta = neovim.meta // {
122126 # To prevent builds on hydra