diff options
| author | Thibault Gagnaux <tgagnaux@gmail.com> | 2021-11-24 16:29:06 +0100 |
|---|---|---|
| committer | Thibault Gagnaux <tgagnaux@gmail.com> | 2021-12-09 08:23:39 +0100 |
| commit | 0a16289964177e37bd104a3b2ea51d36347a201a (patch) | |
| tree | 071d7a9adbdebf904f8a1bdbcec083639c9a80ed | |
| parent | 47ae9997ab257dc46903a56a9ffa8b4e518e0c38 (diff) | |
| download | nixpkgs-0a16289964177e37bd104a3b2ea51d36347a201a.tar nixpkgs-0a16289964177e37bd104a3b2ea51d36347a201a.tar.gz nixpkgs-0a16289964177e37bd104a3b2ea51d36347a201a.tar.bz2 nixpkgs-0a16289964177e37bd104a3b2ea51d36347a201a.tar.lz nixpkgs-0a16289964177e37bd104a3b2ea51d36347a201a.tar.xz nixpkgs-0a16289964177e37bd104a3b2ea51d36347a201a.tar.zst nixpkgs-0a16289964177e37bd104a3b2ea51d36347a201a.zip | |
openjdk11: add zulu `javaFX` java package on darwin
| -rw-r--r-- | pkgs/development/compilers/openjdk/darwin/11.nix | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index 0b158a16932..bd83ea82113 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +{ lib +, stdenv +, fetchurl +, unzip +, setJavaClassPath +, enableJavaFX ? false +}: let # Details from https://www.azul.com/downloads/?version=java-11-lts&os=macos&package=jdk # Note that the latest build may differ by platform @@ -7,29 +13,35 @@ let arch = "x64"; zuluVersion = "11.48.21"; jdkVersion = "11.0.11"; - sha256 = "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6"; + sha256 = + if enableJavaFX then "18bd9cd66d6abc6f8c627bc70278dc8fd4860e138e1dc9e170eddb89727ccc7b" + else "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6"; }; aarch64-darwin = { arch = "aarch64"; zuluVersion = "11.48.21"; jdkVersion = "11.0.11"; - sha256 = "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; + sha256 = + if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9" + else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; + jdk = stdenv.mkDerivation rec { - pname = "zulu${dist.zuluVersion}-ca-jdk"; + pname = "zulu${dist.zuluVersion}-${javaPackage}"; version = dist.jdkVersion; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; inherit (dist) sha256; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; @@ -77,4 +89,5 @@ let meta = import ./meta.nix lib; }; -in jdk +in +jdk |