make jdk25 the default

3 files changed, 25 insertions, 10 deletions

diff --git a/home/development.nix b/home/development.nix
index 86b6402..fc71a7f 100644
--- a/home/development.nix
+++ b/home/development.nix
@@ -31,7 +31,7 @@ in {
         clippy
       ])
       ++ (optionals cfg.java.enable [
-        gradle_9
+        gradle
         jdk25
         jdt-language-server
         kotlin-language-server
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 5379c5b..3a31acf 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,10 +1,20 @@
 {
   final,
   prev ? final,
-}: {
+}: rec {
   arcanist = final.callPackage ./arcanist {};
   astal = final.callPackage ./astal {};
-  kotlin-language-server = final.callPackage ./kotlin-language-server {inherit (prev) kotlin-language-server;};
   libfprint-2-tod1-vfs0090 = final.callPackage ./libfprint-2-tod1-vfs0090 {inherit (prev) libfprint-2-tod1-vfs0090;};
   solaar-udev-rules = final.callPackage ./solaar-udev-rules {};
+
+  # change default jdk
+  openjdk = final.openjdk25;
+  jdk = openjdk;
+  gradle = final.gradle_9.override {java = openjdk;};
+
+  # patch jdk25 into kotlin lsp
+  kotlin-language-server = final.callPackage ./kotlin-language-server {
+    inherit (prev) kotlin-language-server;
+    inherit gradle openjdk;
+  };
 }
diff --git a/pkgs/kotlin-language-server/default.nix b/pkgs/kotlin-language-server/default.nix
index d03468c..2b7a8a8 100644
--- a/pkgs/kotlin-language-server/default.nix
+++ b/pkgs/kotlin-language-server/default.nix
@@ -1,7 +1,12 @@
-{kotlin-language-server}:
-kotlin-language-server.overrideAttrs {
-  src = fetchTarball {
-    url = "https://f.freya.cat/bin/kotlin-language-server.tar.gz";
-    sha256 = "14bcah09dsgx4frffl2k9cppjqgpn1q0pnx6bpx2qlz9wiw4kwzs";
-  };
-}
+{
+  kotlin-language-server,
+  gradle,
+  openjdk,
+}:
+(kotlin-language-server.overrideAttrs
+  {
+    src = fetchTarball {
+      url = "https://f.freya.cat/bin/kotlin-language-server.tar.gz";
+      sha256 = "14bcah09dsgx4frffl2k9cppjqgpn1q0pnx6bpx2qlz9wiw4kwzs";
+    };
+  }).override {inherit gradle openjdk;}