b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

openjdk*: fix darwin eval failure

Browse source 
only ./pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
has the gtkSupport option
This commit is contained in:
Artturin 2022-10-03 20:01:57 +03:00
parent a46be8f23d
commit 81b9d5cab6
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: