dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #194255 from Artturin/fixevalfailjdk

Browse Source 
openjdk*: fix darwin eval failure
This commit is contained in:
Robert Hensing 2022-10-04 16:42:34 +01:00 committed by GitHub
commit 48177fb6ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/java-packages.nix
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: