Commit 76b4f41a authored by Matthieu Coudron's avatar Matthieu Coudron Committed by GitHub
Browse files

neovimUtils.makeVimPackageInfo: add lua dependencies (#500415)

parents f1e2c6cd 6eae1897

pkgs/applications/editors/neovim/module.nix

+14 −0
Original line number Diff line number Diff line
@@ -93,6 +93,14 @@ in 
      '';

    };



    luaDependencies = lib.mkOption {

      readOnly = true;

      type = lib.types.listOf (lib.types.nullOr lib.types.package);

      example = lib.literalExpression "[ (lp: [ lp.mpack ]) ]";

      description = ''

        Lua dependencies required by the plugins.

      '';

    };

  };



  config =
@@ -122,5 +130,11 @@ in 
      ) [ ] pluginsNormalized;



      pluginPython3Packages = map (plugin: plugin.python3Dependencies or (_: [ ])) pluginsNormalized;



      luaDependencies =

        let

          op = acc: p: acc ++ (p.plugin.requiredLuaModules or [ ]);

        in

        lib.foldl' op [ ] pluginsNormalized;

    };

}

pkgs/applications/editors/neovim/utils.nix

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ let 
        runtimeDeps

        pluginAdvisedLua

        pluginPython3Packages

        luaDependencies

        ;



      # A Vim "package", see ':h packages'

pkgs/applications/editors/neovim/wrapper.nix

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ let 


        luaPathLuaRc =

          let

            luaEnv = lua.withPackages extraLuaPackages;

            luaEnv = lua.withPackages (lp: extraLuaPackages lp ++ vimPackageInfo.luaDependencies);



            # getLuaPath / getLuaCPath are not interpreter dependant at the moment and might thus cause

            # errors between luajit/Puc lua