Merge pull request #194255 from Artturin/fixevalfailjdk

openjdk*: fix darwin eval failure
This commit is contained in:
Robert Hensing
2022-10-04 16:42:34 +01:00
committed by GitHub
+5 -1
View File
@@ -45,7 +45,11 @@ in {
mkBootstrap = adoptopenjdk: path: args:
/* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */
if adoptopenjdk.jdk-hotspot.meta.available
then adoptopenjdk.jdk-hotspot.override { gtkSupport = false; }
then
# only linux has the gtkSupport option
if stdenv.isLinux
then adoptopenjdk.jdk-hotspot.override { gtkSupport = false; }
else adoptopenjdk.jdk-hotspot
else callPackage path args;
mkOpenjdk = path-linux: path-darwin: args: