This commit is contained in:
11
jdk.nix
11
jdk.nix
@@ -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 can’t 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}"
|
||||
];
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user