forked from mirrors/nixpkgs
erlang: use openjdk8
This commit is contained in:
parent
5092ae7f5d
commit
db0d3d8d36
|
@ -1,6 +1,7 @@
|
|||
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
|
||||
, libxml2, libxslt, ncurses, openssl, perl, autoconf
|
||||
, openjdk ? null # javacSupport
|
||||
# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
|
||||
, openjdk8 ? null # javacSupport
|
||||
, unixODBC ? null # odbcSupport
|
||||
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
|
||||
, parallelBuild ? false
|
||||
|
@ -17,7 +18,7 @@
|
|||
, enableThreads ? true
|
||||
, enableSmpSupport ? true
|
||||
, enableKernelPoll ? true
|
||||
, javacSupport ? false, javacPackages ? [ openjdk ]
|
||||
, javacSupport ? false, javacPackages ? [ openjdk8 ]
|
||||
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
|
||||
, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
|
||||
, preUnpack ? "", postUnpack ? ""
|
||||
|
@ -36,7 +37,7 @@ assert wxSupport -> (if stdenv.isDarwin
|
|||
else libGL != null && libGLU != null && wxGTK != null && xorg != null);
|
||||
|
||||
assert odbcSupport -> unixODBC != null;
|
||||
assert javacSupport -> openjdk != null;
|
||||
assert javacSupport -> openjdk8 != null;
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionals optionalAttrs optionalString;
|
||||
|
|
Loading…
Reference in a new issue