diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2020-09-19 14:34:49 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2020-09-19 14:34:49 +0200 |
| commit | db0d3d8d365dccf826223d753dd9234aa643a074 (patch) | |
| tree | 3c5ff39911c6b8910db0344a4682473ef50811c3 | |
| parent | 5092ae7f5de772bf0b05e9558f5ba4abf5643735 (diff) | |
erlang: use openjdk8
| -rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index a53a917b7b37..18b658ae37ce 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -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; |