From 81b9d5cab6f40d41b288cac918110279978a6277 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 3 Oct 2022 20:01:57 +0300 Subject: [PATCH] openjdk*: fix darwin eval failure only ./pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix has the gtkSupport option --- pkgs/top-level/java-packages.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index e8ce756fe990..ba69287fa8dc 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -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: