MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

adoptopenjdk-bin: disable openj9 jre for mac due to missing upstream

Browse source
This commit is contained in:
Benno Fünfstück 2018-12-19 13:56:28 +01:00
parent 682d1befd9
commit 6972c433ab
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
View file

@ -5,5 +5,6 @@ in
jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
# openj9 jre builds are currently missing: https://github.com/AdoptOpenJDK/openjdk-build/issues/796
#jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
}

9
pkgs/top-level/all-packages.nix
View file

@ -6557,9 +6557,12 @@ in
adoptopenjdk-openj9-bin-11 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}
else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-openj9 {};
adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
# openj9 jre builds for mac are currently missing (upstream)
#adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux
# then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
# else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {};
adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;