This commit is contained in:
31
jdk.nix
31
jdk.nix
@@ -1,18 +1,27 @@
|
|||||||
{ buildPlatform, hostPlatform, jdk17, which, zip, buildPackages }:
|
{
|
||||||
|
buildPlatform,
|
||||||
|
hostPlatform,
|
||||||
|
jdk21,
|
||||||
|
which,
|
||||||
|
zip,
|
||||||
|
buildPackages,
|
||||||
|
}:
|
||||||
if buildPlatform == hostPlatform
|
if buildPlatform == hostPlatform
|
||||||
then jdk17
|
then jdk21
|
||||||
else (jdk17.override {
|
else
|
||||||
|
(jdk21.override {
|
||||||
# libIDL does not compile in cross-compile scenarios.
|
# libIDL does not compile in cross-compile scenarios.
|
||||||
enableGnome2 = false;
|
enableGnome2 = false;
|
||||||
}).overrideAttrs (old: {
|
}).overrideAttrs (old: {
|
||||||
# lol, nixpkgs can’t get pkgs right
|
# lol, nixpkgs can’t get pkgs right
|
||||||
# AUTOCONF = "${autoconf}/bin/autoconf";
|
# AUTOCONF = "${autoconf}/bin/autoconf";
|
||||||
nativeBuildInputs = old.nativeBuildInputs ++ [ which zip ];
|
nativeBuildInputs = old.nativeBuildInputs ++ [which zip];
|
||||||
depsBuildBuild = with buildPackages; [ stdenv.cc autoconf ];
|
depsBuildBuild = with buildPackages; [stdenv.cc autoconf];
|
||||||
configureFlags = old.configureFlags ++ [
|
configureFlags =
|
||||||
|
old.configureFlags
|
||||||
|
++ [
|
||||||
"--with-jtreg=no"
|
"--with-jtreg=no"
|
||||||
"--disable-hotspot-gtest"
|
"--disable-hotspot-gtest"
|
||||||
"--with-build-jdk=${buildPackages.jdk17}"
|
"--with-build-jdk=${buildPackages.jdk21}"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
965b8e64fca915c603b37a96d5fd89875a26d413f478cd7a705270542040e4bb
|
8c3de5e5d9088b7074ca097e6f508caffb41cab1869db3586f41d4440b820540
|
||||||
@@ -1 +1 @@
|
|||||||
13bef91c96d9c145485d6c0e0328bb1a6bcc54a7e0cb307318b36b3b09491617
|
c71bf0af368e171cc3d58e32ba98d34405569aa787de28cd5e616edbeaf1e019
|
||||||
Reference in New Issue
Block a user