mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-01 11:01:15 +00:00
languages/kotlin: allow specifying a command for lsp.package, fix indentation
This commit is contained in:
parent
30a8a8fce0
commit
5ab1af9285
1 changed files with 10 additions and 10 deletions
|
@ -8,7 +8,7 @@
|
||||||
inherit (lib.modules) mkIf mkMerge;
|
inherit (lib.modules) mkIf mkMerge;
|
||||||
inherit (lib.meta) getExe;
|
inherit (lib.meta) getExe;
|
||||||
inherit (lib.nvim.languages) diagnosticsToLua;
|
inherit (lib.nvim.languages) diagnosticsToLua;
|
||||||
inherit (lib.types) package;
|
inherit (lib.types) either package listOf str;
|
||||||
inherit (lib.nvim.types) mkGrammarOption diagnostics;
|
inherit (lib.nvim.types) mkGrammarOption diagnostics;
|
||||||
inherit (lib.lists) isList;
|
inherit (lib.lists) isList;
|
||||||
inherit (lib.nvim.lua) expToLua;
|
inherit (lib.nvim.lua) expToLua;
|
||||||
|
@ -43,17 +43,17 @@ in {
|
||||||
|
|
||||||
package = mkOption {
|
package = mkOption {
|
||||||
description = "kotlin_language_server package with Kotlin runtime";
|
description = "kotlin_language_server package with Kotlin runtime";
|
||||||
type = package;
|
type = either package (listOf str);
|
||||||
example = literalExpression ''
|
example = literalExpression ''
|
||||||
pkgs.symlinkJoin {
|
pkgs.symlinkJoin {
|
||||||
name = "kotlin-language-server-wrapped";
|
name = "kotlin-language-server-wrapped";
|
||||||
paths = [pkgs.kotlin-language-server];
|
paths = [pkgs.kotlin-language-server];
|
||||||
nativeBuildInputs = [pkgs.makeWrapper];
|
nativeBuildInputs = [pkgs.makeBinaryWrapper];
|
||||||
postBuild = '''
|
postBuild = '''
|
||||||
wrapProgram $out/bin/kotlin-language-server \
|
wrapProgram $out/bin/kotlin-language-server \
|
||||||
--prefix PATH : ''${pkgs.kotlin}/bin
|
--prefix PATH : ''${pkgs.kotlin}/bin
|
||||||
''';
|
''';
|
||||||
};
|
};
|
||||||
'';
|
'';
|
||||||
default = pkgs.kotlin-language-server;
|
default = pkgs.kotlin-language-server;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue