diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index c601ca63b7cd..b8726749bef8 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -40,7 +40,7 @@ let providedCpuTypes = builtins.filter (arch: builtins.elem arch validCpuTypes) (builtins.attrNames sourcePerArch); - result = stdenv.mkDerivation rec { + result = stdenv.mkDerivation { pname = if sourcePerArch.packageType == "jdk" then "${name-prefix}-bin" else "${name-prefix}-${sourcePerArch.packageType}-bin"; diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index f649717f1845..abdfafa7d052 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -34,7 +34,7 @@ in { package = if stdenv.isLinux then package-linux else package-darwin; - in rec { + in { inherit package-linux package-darwin; jdk-hotspot = callPackage package.jdk-hotspot {}; @@ -66,11 +66,7 @@ in { headless = openjdk.override { headless = true; }; }; - openjdkDarwinMissing = version: - abort "OpenJDK ${builtins.toString version} is currently not supported on Darwin by nixpkgs."; - in rec { - adoptopenjdk-8 = mkAdoptopenjdk ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix;