make sure the runtimepath is set in NixOS 22.05 (#44)

This commit is contained in:
Luc Chabassier 2022-10-07 15:54:04 +02:00 committed by GitHub
parent 08f3a9d78a
commit 1fe6ab0e08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -91,10 +91,17 @@ in
normalizedPlugins = map (x: defaultPlugin // (if x ? plugin then x else { plugin = x; })) config.extraPlugins; normalizedPlugins = map (x: defaultPlugin // (if x ? plugin then x else { plugin = x; })) config.extraPlugins;
neovimConfig = pkgs.neovimUtils.makeNeovimConfig { neovimConfig = pkgs.neovimUtils.makeNeovimConfig ({
inherit customRC; inherit customRC;
plugins = normalizedPlugins; plugins = normalizedPlugins;
}; }
# Necessary to make sure the runtime path is set properly in NixOS 22.05,
# or more generally before the commit:
# cda1f8ae468 - neovim: pass packpath via the wrapper
// optionalAttrs (functionArgs pkgs.neovimUtils.makeNeovimConfig ? configure) {
configure.packages =
{ nixvim = { start = map (x: x.plugin) normalizedPlugins; opt = []; }; };
});
extraWrapperArgs = optionalString (config.extraPackages != [ ]) extraWrapperArgs = optionalString (config.extraPackages != [ ])
''--prefix PATH : "${makeBinPath config.extraPackages}"''; ''--prefix PATH : "${makeBinPath config.extraPackages}"'';