Commit e0c22ecf authored by Sandro Jäckel's avatar Sandro Jäckel Committed by Anderson Torres
Browse files

javaPackages: cleanup unused code

parent 8204a95e

pkgs/development/compilers/temurin-bin/jdk-linux-base.nix

+1 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/java-packages.nix

+1 −5
Original line number Diff line number Diff line
@@ -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;