BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

erlang: update jdk to lts

Browse source
This commit is contained in:
happysalada 2021-02-14 05:56:48 +09:00
parent 59eabeea8d
commit b7e067969d
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/interpreters/erlang/generic-builder.nix
View file

@ -1,7 +1,6 @@
{ pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused { pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
, libxml2, libxslt, ncurses, openssl, perl, autoconf , libxml2, libxslt, ncurses, openssl, perl, autoconf
# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 , openjdk11 ? null # javacSupport
, openjdk8 ? null # javacSupport
, unixODBC ? null # odbcSupport , unixODBC ? null # odbcSupport
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null
, parallelBuild ? false , parallelBuild ? false
@ -17,7 +16,7 @@
, enableThreads ? true , enableThreads ? true
, enableSmpSupport ? true , enableSmpSupport ? true
, enableKernelPoll ? true , enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk8 ] , javacSupport ? false, javacPackages ? [ openjdk11 ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ] , odbcSupport ? false, odbcPackages ? [ unixODBC ]
, withSystemd ? stdenv.isLinux # systemd support in epmd , withSystemd ? stdenv.isLinux # systemd support in epmd
, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
@ -37,7 +36,7 @@ assert wxSupport -> (if stdenv.isDarwin
else libGL != null && libGLU != null && wxGTK != null && xorg != null); else libGL != null && libGLU != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null; assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk8 != null; assert javacSupport -> openjdk11 != null;
let let
inherit (lib) optional optionals optionalAttrs optionalString; inherit (lib) optional optionals optionalAttrs optionalString;