javaPackages: cleanup unused code

This commit is contained in:
Sandro Jäckel
2023-04-14 22:23:39 -03:00
committed by Anderson Torres
parent 8204a95ef2
commit e0c22ecf8e
2 changed files with 2 additions and 6 deletions
@@ -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";
+1 -5
View File
@@ -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;