From c199379d998f8622033a39280155005992ea3848 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Wed, 29 Apr 2026 16:40:35 -0400
Subject: make jdk25 the default

---
 pkgs/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'pkgs/default.nix')

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;
+  };
 }
-- 
cgit v1.3.1-freya