about summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorYorick <yorick@yorickvanpelt.nl>2021-01-31 12:24:24 +0100
committerYorick van Pelt <yorick@yorickvanpelt.nl>2021-01-31 12:40:54 +0100
commit8622e4965b5ef0daf23e33155c64b1ec747388df (patch)
treefc1c47f091de02dabf76bffac070afd320abe0fd /pkgs/development/interpreters
parent11e40404573b882e13501257cb4c6ef15603c5f3 (diff)
downloadnixlib-8622e4965b5ef0daf23e33155c64b1ec747388df.tar
nixlib-8622e4965b5ef0daf23e33155c64b1ec747388df.tar.gz
nixlib-8622e4965b5ef0daf23e33155c64b1ec747388df.tar.bz2
nixlib-8622e4965b5ef0daf23e33155c64b1ec747388df.tar.lz
nixlib-8622e4965b5ef0daf23e33155c64b1ec747388df.tar.xz
nixlib-8622e4965b5ef0daf23e33155c64b1ec747388df.tar.zst
nixlib-8622e4965b5ef0daf23e33155c64b1ec747388df.zip
beam-packages: remove wxSupport from bootstrap arguments
Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/erlang/generic-builder.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix
index dce101b46e27..becebb03fd7f 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 ? ""