mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
openjdk16: make linux-only
This commit is contained in:
parent
010e1d59d8
commit
111dd2ed97
@ -1,26 +0,0 @@
|
||||
{ callPackage
|
||||
, enableJavaFX ? false
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
callPackage ./common.nix ({
|
||||
# Details from https://www.azul.com/downloads/?version=java-16-sts&package=jdk
|
||||
# Note that the latest build may differ by platform
|
||||
dists = {
|
||||
x86_64-darwin = {
|
||||
zuluVersion = "16.32.15";
|
||||
jdkVersion = "16.0.2";
|
||||
hash =
|
||||
if enableJavaFX then "sha256-6URaSBNHQWLauO//kCuKXb4Z7AqyshWnoeJEyVRKgaY="
|
||||
else "sha256-NXgBj/KixTknaCYbo3B+rOo11NImH5CDUIU0LhTCtMo=";
|
||||
};
|
||||
|
||||
aarch64-darwin = {
|
||||
zuluVersion = "16.32.15";
|
||||
jdkVersion = "16.0.2";
|
||||
hash =
|
||||
if enableJavaFX then "sha256-QuyhIAxUY3Vv1adGihW+LIsXtpDX2taCmFsMFj9o5vs="
|
||||
else "sha256-3bUfDcLLyahLeURFAgLAVapBZHvqtam8GHbWTA6MQog=";
|
||||
};
|
||||
};
|
||||
} // builtins.removeAttrs args [ "callPackage" ])
|
@ -176,13 +176,10 @@ in {
|
||||
openjfx = openjfx15;
|
||||
};
|
||||
|
||||
openjdk16 = mkOpenjdk
|
||||
../development/compilers/openjdk/16.nix
|
||||
../development/compilers/zulu/16.nix
|
||||
{
|
||||
inherit openjdk16-bootstrap;
|
||||
openjfx = openjfx15;
|
||||
};
|
||||
openjdk16 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/16.nix {
|
||||
inherit openjdk16-bootstrap;
|
||||
openjfx = openjfx15;
|
||||
};
|
||||
|
||||
openjdk17 = mkOpenjdk
|
||||
../development/compilers/openjdk/17.nix
|
||||
|
Loading…
Reference in New Issue
Block a user