diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index 7b16d6ad9dbc..03857627952d 100644 --- a/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -6,7 +6,7 @@ sourcePerArch: }: let cpuName = stdenv.hostPlatform.parsed.cpu.name; - result = stdenv.mkDerivation rec { + result = stdenv.mkDerivation { name = if sourcePerArch.packageType == "jdk" then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}" else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.${cpuName}.version}"; @@ -46,9 +46,6 @@ let cpuName = stdenv.hostPlatform.parsed.cpu.name; passthru.home = result; - # for backward compatibility - passthru.architecture = ""; - meta = with stdenv.lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; |