From 8622e4965b5ef0daf23e33155c64b1ec747388df Mon Sep 17 00:00:00 2001 From: Yorick Date: Sun, 31 Jan 2021 12:24:24 +0100 Subject: [PATCH] beam-packages: remove wxSupport from bootstrap arguments Co-authored-by: Jonathan Ringer --- pkgs/development/interpreters/erlang/generic-builder.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index dce101b46e2..becebb03fd7 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -3,11 +3,10 @@ # 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 ? true +, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null , parallelBuild ? false -, systemd +, systemd, wxSupport ? true }: -let defaultWxSupport = wxSupport; in { baseName ? "erlang" , version , sha256 ? null @@ -21,7 +20,7 @@ let defaultWxSupport = wxSupport; in , javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd -, wxSupport ? defaultWxSupport, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] +, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""