diff --git a/jdk.nix b/jdk.nix index 1a65a7a..3f160d4 100644 --- a/jdk.nix +++ b/jdk.nix @@ -1,18 +1,27 @@ -{ buildPlatform, hostPlatform, jdk17, which, zip, buildPackages }: - +{ + buildPlatform, + hostPlatform, + jdk21, + which, + zip, + buildPackages, +}: if buildPlatform == hostPlatform -then jdk17 -else (jdk17.override { +then jdk21 +else + (jdk21.override { # libIDL does not compile in cross-compile scenarios. enableGnome2 = false; -}).overrideAttrs (old: { + }).overrideAttrs (old: { # lol, nixpkgs can’t get pkgs right # AUTOCONF = "${autoconf}/bin/autoconf"; - nativeBuildInputs = old.nativeBuildInputs ++ [ which zip ]; - depsBuildBuild = with buildPackages; [ stdenv.cc autoconf ]; - configureFlags = old.configureFlags ++ [ + nativeBuildInputs = old.nativeBuildInputs ++ [which zip]; + depsBuildBuild = with buildPackages; [stdenv.cc autoconf]; + configureFlags = + old.configureFlags + ++ [ "--with-jtreg=no" "--disable-hotspot-gtest" - "--with-build-jdk=${buildPackages.jdk17}" - ]; -}) + "--with-build-jdk=${buildPackages.jdk21}" + ]; + }) diff --git a/openhab-addons.sha256 b/openhab-addons.sha256 index 3230653..ab85311 100644 --- a/openhab-addons.sha256 +++ b/openhab-addons.sha256 @@ -1 +1 @@ -965b8e64fca915c603b37a96d5fd89875a26d413f478cd7a705270542040e4bb \ No newline at end of file +8c3de5e5d9088b7074ca097e6f508caffb41cab1869db3586f41d4440b820540 \ No newline at end of file diff --git a/openhab.sha256 b/openhab.sha256 index 87bb8fb..5120a01 100644 --- a/openhab.sha256 +++ b/openhab.sha256 @@ -1 +1 @@ -13bef91c96d9c145485d6c0e0328bb1a6bcc54a7e0cb307318b36b3b09491617 \ No newline at end of file +c71bf0af368e171cc3d58e32ba98d34405569aa787de28cd5e616edbeaf1e019 \ No newline at end of file diff --git a/version b/version index bbdf097..32f3eaa 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.3.5 \ No newline at end of file +5.0.1 \ No newline at end of file