public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

erlang: use openjdk8

Browse Source
This commit is contained in:
Gabriel Ebner 2020-09-19 14:34:49 +02:00
parent 5092ae7f5d
commit db0d3d8d36
1 changed files with 4 additions and 3 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,6 +1,7 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused { pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
, libxml2, libxslt, ncurses, openssl, perl, autoconf , 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 , unixODBC ? null # odbcSupport
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
, parallelBuild ? false , parallelBuild ? false
@ -17,7 +18,7 @@
, enableThreads ? true , enableThreads ? true
, enableSmpSupport ? true , enableSmpSupport ? true
, enableKernelPoll ? true , enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk ] , javacSupport ? false, javacPackages ? [ openjdk8 ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ] , odbcSupport ? false, odbcPackages ? [ unixODBC ]
, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? "" , preUnpack ? "", postUnpack ? ""
@ -36,7 +37,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 -> openjdk != null; assert javacSupport -> openjdk8 != null;
let let
inherit (stdenv.lib) optional optionals optionalAttrs optionalString; inherit (stdenv.lib) optional optionals optionalAttrs optionalString;