git.iko.soy/typeable/nixpkgs
on master help sign in
erlang: update jdk to lts
commitb7e067969d8d50e104bd028ff681db63a4cb9a70 authorhappysalada <raphael@megzari.com> dateSun 14 Feb 2021, 05:56 (6 years ago) parent59eabee
1 file changed+3−4
pkgs/development/interpreters/erlang/generic-builder.nix+3−4
pkgs/development/interpreters/erlang/generic-builder.nix+3−4
@@ -1,7 +1,6 @@
11{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
22, libxml2, libxslt, ncurses, openssl, perl, autoconf
3−# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
4−, openjdk8 ? null # javacSupport
3+, openjdk11 ? null # javacSupport
54, unixODBC ? null # odbcSupport
65, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null
76, parallelBuild ? false
@@ -17,7 +16,7 @@
1716, enableThreads ? true
1817, enableSmpSupport ? true
1918, enableKernelPoll ? true
20−, javacSupport ? false, javacPackages ? [ openjdk8 ]
19+, javacSupport ? false, javacPackages ? [ openjdk11 ]
2120, odbcSupport ? false, odbcPackages ? [ unixODBC ]
2221, withSystemd ? stdenv.isLinux # systemd support in epmd
2322, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
@@ -37,7 +36,7 @@ assert wxSupport -> (if stdenv.isDarwin
3736 else libGL != null && libGLU != null && wxGTK != null && xorg != null);
3837
3938assert odbcSupport -> unixODBC != null;
40−assert javacSupport -> openjdk8 != null;
39+assert javacSupport -> openjdk11 != null;
4140
4241let
4342 inherit (lib) optional optionals optionalAttrs optionalString;