Revert "adoptopenjdk: autogenerate sources + add support for aarch64 (#52454)"
This reverts commitf2dfe8b9e6, reversing changes made toe116aa1d4b. The `openj9` attribute is missing for `jre` in case of `mac`. This missing attribute is now blocking the channels from updating. cc @bennofs
This commit is contained in:
@@ -1,4 +1,7 @@
|
||||
sourcePerArch:
|
||||
{ name
|
||||
, url
|
||||
, sha256
|
||||
}:
|
||||
|
||||
{ swingSupport ? true # not used for now
|
||||
, stdenv
|
||||
@@ -6,12 +9,10 @@ sourcePerArch:
|
||||
}:
|
||||
|
||||
let result = stdenv.mkDerivation rec {
|
||||
name = if sourcePerArch.packageType == "jdk"
|
||||
then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"
|
||||
else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}";
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256;
|
||||
inherit url sha256;
|
||||
};
|
||||
|
||||
# See: https://github.com/NixOS/patchelf/issues/10
|
||||
|
||||
Reference in New Issue
Block a user