git.iko.soy/typeable/nixpkgs
on master help sign in
adoptopenjdk-bin: disable openj9 jre for mac due to missing upstream
commit6972c433ab8b591707aabe4d0ae5055e71821949 authorBenno Fünfstück <benno.fuenfstueck@gmail.com> dateWed 19 Dec 2018, 13:56 (8 years ago) parent682d1be
2 files changed+8−4
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix+2−1 pkgs/top-level/all-packages.nix+6−3
pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix+2−1
@@ -5,5 +5,6 @@ in
55 jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot;
66 jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot;
77 jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9;
8− jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
8+ # openj9 jre builds are currently missing: https://github.com/AdoptOpenJDK/openjdk-build/issues/796
9+ #jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9;
910}
pkgs/top-level/all-packages.nix+6−3
@@ -6557,9 +6557,12 @@ in
65576557 adoptopenjdk-openj9-bin-11 = if stdenv.isLinux
65586558 then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}
65596559 else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-openj9 {};
6560− adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux
6561− then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
6562− else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
6560+
6561+ # openj9 jre builds for mac are currently missing (upstream)
6562+ #adoptopenjdk-jre-openj9-bin-11 = if stdenv.isLinux
6563+ # then callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}
6564+ # else callPackage adoptopenjdk-bin-11-packages-darwin.jre-openj9 {};
6565+ adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {};
65636566
65646567 adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
65656568 adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;