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

beam-packages: move wxSupport arg up to package set, add beam_nox

Browse Source 
This allows us to override the erlang wxSupport argument globally from
an overlay, fixing builds for e.g. rabbitmq with noXlibs set.
This commit is contained in:
Yorick van Pelt
2021-01-24 21:04:52 +01:00
parent fd3d62bcdf
commit 9df9c1992b
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/erlang/generic-builder.nix
+3 -3
View File
@@ -3,11 +3,11 @@
# 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
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null, wxSupport ? true
, parallelBuild ? false
, systemd
}:
let defaultWxSupport = wxSupport; in
{ baseName ? "erlang"
, version
, sha256 ? null
@@ -21,7 +21,7 @@
, javacSupport ? false, javacPackages ? [ openjdk8 ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
, withSystemd ? stdenv.isLinux # systemd support in epmd
, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
, wxSupport ? defaultWxSupport, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""