pyrox.dev
Merge staging-next into staging
authored by github-actions[bot] and committed by GitHub a984d3a7 f233449e
+5
-1
pkgs/top-level/java-packages.nix
+5
-1
pkgs/top-level/java-packages.nix
···
45
mkBootstrap = adoptopenjdk: path: args:
46
/* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */
47
if adoptopenjdk.jdk-hotspot.meta.available
48
-
then adoptopenjdk.jdk-hotspot.override { gtkSupport = false; }
49
else callPackage path args;
50
51
mkOpenjdk = path-linux: path-darwin: args:
···
45
mkBootstrap = adoptopenjdk: path: args:
46
/* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */
47
if adoptopenjdk.jdk-hotspot.meta.available
48
+
then
49
+
# only linux has the gtkSupport option
50
+
if stdenv.isLinux
51
+
then adoptopenjdk.jdk-hotspot.override { gtkSupport = false; }
52
+
else adoptopenjdk.jdk-hotspot
53
else callPackage path args;
54
55
mkOpenjdk = path-linux: path-darwin: args: