From 53b1013f991c0ded64de1396cd5ae56343ec111e Mon Sep 17 00:00:00 2001
From: Van Tuan Vo <mail@tuan-vo.de>
Date: Thu, 17 Mar 2022 10:56:01 +0100
Subject: [PATCH 1/2] kotlin-language-server: fix missing JDK in PATH

---
 .../development/tools/kotlin-language-server/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix
index d48c5ace3e36..ded948d83434 100644
--- a/pkgs/development/tools/kotlin-language-server/default.nix
+++ b/pkgs/development/tools/kotlin-language-server/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip, openjdk11, gradle }:
+{ lib, stdenv, fetchurl, unzip, openjdk11, gradle, makeWrapper, maven }:
 
 stdenv.mkDerivation rec {
   pname = "kotlin-language-server";
@@ -17,14 +17,19 @@ stdenv.mkDerivation rec {
     cp -r bin/* $out/bin
   '';
 
-  nativeBuildInputs = [ unzip gradle ];
+  nativeBuildInputs = [ unzip gradle makeWrapper ];
   buildInputs = [ openjdk11 gradle ];
 
+  postFixup = ''
+    wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk11} --prefix PATH : ${lib.strings.makeBinPath [ openjdk11 maven ] }
+  '';
+
   meta = {
     description = "kotlin language server";
     longDescription = ''
       About Kotlin code completion, linting and more for any editor/IDE
       using the Language Server Protocol Topics'';
+    maintainers = with lib.maintainers; [ vtuan10 ];
     homepage = "https://github.com/fwcd/kotlin-language-server";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;

From bc6912323b4125bb2715b68fef4ee969c1c087aa Mon Sep 17 00:00:00 2001
From: Van Tuan Vo <mail@tuan-vo.de>
Date: Mon, 21 Mar 2022 11:33:13 +0100
Subject: [PATCH 2/2] kotlin-language-server: use fetchzip

---
 pkgs/development/tools/kotlin-language-server/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/kotlin-language-server/default.nix b/pkgs/development/tools/kotlin-language-server/default.nix
index ded948d83434..802763fc67ab 100644
--- a/pkgs/development/tools/kotlin-language-server/default.nix
+++ b/pkgs/development/tools/kotlin-language-server/default.nix
@@ -1,11 +1,11 @@
-{ lib, stdenv, fetchurl, unzip, openjdk11, gradle, makeWrapper, maven }:
+{ lib, stdenv, fetchzip, openjdk11, gradle, makeWrapper, maven }:
 
 stdenv.mkDerivation rec {
   pname = "kotlin-language-server";
   version = "1.3.0";
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip";
-    sha256 = "sha256-yyqI+87vtggSeAfb3OEftalknqbTDEQ5gTJwB/EMIlY=";
+    hash = "sha256-nqrZoSntomNLUMTni/yoiVhDOJFSFmZeGze8IJhITu0=";
   };
 
   dontBuild = true;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     cp -r bin/* $out/bin
   '';
 
-  nativeBuildInputs = [ unzip gradle makeWrapper ];
+  nativeBuildInputs = [ gradle makeWrapper ];
   buildInputs = [ openjdk11 gradle ];
 
   postFixup = ''