diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-02-17 10:09:12 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-02-17 10:09:12 +0100 |
| commit | cbb03f556442958262da8a1f5afd8c34f6262e7d (patch) | |
| tree | 4743418ecb512c1b51ad0da49f575b70f8526fcc /pkgs/top-level | |
| parent | 21531d353b2b1ccd4ac5719db677b1baa7894600 (diff) | |
| parent | f84aef11a4cea741b68e2966f5f189320708bc60 (diff) | |
| download | nixlib-cbb03f556442958262da8a1f5afd8c34f6262e7d.tar nixlib-cbb03f556442958262da8a1f5afd8c34f6262e7d.tar.gz nixlib-cbb03f556442958262da8a1f5afd8c34f6262e7d.tar.bz2 nixlib-cbb03f556442958262da8a1f5afd8c34f6262e7d.tar.lz nixlib-cbb03f556442958262da8a1f5afd8c34f6262e7d.tar.xz nixlib-cbb03f556442958262da8a1f5afd8c34f6262e7d.tar.zst nixlib-cbb03f556442958262da8a1f5afd8c34f6262e7d.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74024ded7b6b..5bc5cd262b10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6561,11 +6561,9 @@ in then callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {} else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-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-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-bin = adoptopenjdk-hotspot-bin-11; adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; |