From b7e067969d8d50e104bd028ff681db63a4cb9a70 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 14 Feb 2021 05:56:48 +0900 Subject: [PATCH] erlang: update jdk to lts --- pkgs/development/interpreters/erlang/generic-builder.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 538b4224909c..ab37c726515d 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,7 +1,6 @@ { pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf -# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 -, openjdk8 ? null # javacSupport +, openjdk11 ? null # javacSupport , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null , parallelBuild ? false @@ -17,7 +16,7 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk8 ] +, javacSupport ? false, javacPackages ? [ openjdk11 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] @@ -37,7 +36,7 @@ assert wxSupport -> (if stdenv.isDarwin else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk8 != null; +assert javacSupport -> openjdk11 != null; let inherit (lib) optional optionals optionalAttrs optionalString;