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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-01-03 00:56:46 +00:00
committed by GitHub
parent 67638a5bec c1149a77c1
commit bc30d1eb34
32 changed files with 1788 additions and 2162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@@ -5,7 +5,7 @@
, unixODBC ? null # odbcSupport
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
, parallelBuild ? false
, withSystemd ? stdenv.isLinux, systemd # systemd support in epmd
, systemd
}:
{ baseName ? "erlang"
@@ -20,6 +20,7 @@
, enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk8 ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
, withSystemd ? stdenv.isLinux # systemd support in epmd
, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""