Fix JDK build
Some checks failed
Update the version / update (push) Has been cancelled

This commit is contained in:
2025-12-05 13:01:04 +01:00
parent 75fb304107
commit 206e975368
2 changed files with 9 additions and 14 deletions

11
jdk.nix
View File

@@ -1,18 +1,14 @@
{
buildPlatform,
hostPlatform,
stdenv,
jdk21,
which,
zip,
buildPackages,
}:
if buildPlatform == hostPlatform
if stdenv.buildPlatform == stdenv.hostPlatform
then jdk21
else
(jdk21.override {
# libIDL does not compile in cross-compile scenarios.
enableGnome2 = false;
}).overrideAttrs (old: {
jdk21.overrideAttrs (old: {
# lol, nixpkgs cant get pkgs right
# AUTOCONF = "${autoconf}/bin/autoconf";
nativeBuildInputs = old.nativeBuildInputs ++ [which zip];
@@ -21,7 +17,6 @@ else
old.configureFlags
++ [
"--with-jtreg=no"
"--disable-hotspot-gtest"
"--with-build-jdk=${buildPackages.jdk21}"
];
})