diff options
| author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-03-10 10:03:58 +0100 |
|---|---|---|
| committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2021-03-10 23:54:55 +0100 |
| commit | 3d17f64b4ee6481ec83b811ea38caa9aa9a06166 (patch) | |
| tree | ed41bc133a8413d6adc7f04cc0e09e692e9e1a62 /pkgs/development/libraries/wxwidgets | |
| parent | eaff9e7a3eb3aba1efa7a2e3ddc4e876576f84ad (diff) | |
| download | nixlib-3d17f64b4ee6481ec83b811ea38caa9aa9a06166.tar nixlib-3d17f64b4ee6481ec83b811ea38caa9aa9a06166.tar.gz nixlib-3d17f64b4ee6481ec83b811ea38caa9aa9a06166.tar.bz2 nixlib-3d17f64b4ee6481ec83b811ea38caa9aa9a06166.tar.lz nixlib-3d17f64b4ee6481ec83b811ea38caa9aa9a06166.tar.xz nixlib-3d17f64b4ee6481ec83b811ea38caa9aa9a06166.tar.zst nixlib-3d17f64b4ee6481ec83b811ea38caa9aa9a06166.zip | |
wxwidgets_3: remove ? null from inputs, format
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 6e5b1d83de52..30e807cde057 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -4,23 +4,20 @@ , xorgproto, gst_all_1, setfile , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withMesa ? libGLSupported -, libGLU ? null, libGL ? null +, libGLU, libGL , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk ? null -, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null +, withWebKit ? false, webkitgtk +, AGL, Carbon, Cocoa, Kernel, QTKit }: with lib; -assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> webkitgtk != null; - assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2."; stdenv.mkDerivation rec { - version = "3.0.5"; pname = "wxwidgets"; + version = "3.0.5"; src = fetchFromGitHub { owner = "wxWidgets"; @@ -29,16 +26,16 @@ stdenv.mkDerivation rec { sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 ] + ] ++ optional withGtk2 gtk2 ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = optional stdenv.isDarwin AGL; patches = [ |