diff options
| author | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2020-12-22 12:22:05 +0100 |
|---|---|---|
| committer | Yorick van Pelt <yorick@yorickvanpelt.nl> | 2021-01-24 21:04:52 +0100 |
| commit | 9df9c1992b1859b50a0607b43ea577611ded8cd9 (patch) | |
| tree | 5fd079d9924f73c997ede119712a486c51ee1212 /pkgs/development/interpreters | |
| parent | fd3d62bcdfa66e505f805ed2757f21020dee7148 (diff) | |
| download | nixlib-9df9c1992b1859b50a0607b43ea577611ded8cd9.tar nixlib-9df9c1992b1859b50a0607b43ea577611ded8cd9.tar.gz nixlib-9df9c1992b1859b50a0607b43ea577611ded8cd9.tar.bz2 nixlib-9df9c1992b1859b50a0607b43ea577611ded8cd9.tar.lz nixlib-9df9c1992b1859b50a0607b43ea577611ded8cd9.tar.xz nixlib-9df9c1992b1859b50a0607b43ea577611ded8cd9.tar.zst nixlib-9df9c1992b1859b50a0607b43ea577611ded8cd9.zip | |
beam-packages: move wxSupport arg up to package set, add beam_nox
This allows us to override the erlang wxSupport argument globally from an overlay, fixing builds for e.g. rabbitmq with noXlibs set.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 4429dc1eaf37..dce101b46e27 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -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 ? "" |