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

wxwidgets_3: remove ? null from inputs, format

Browse Source
This commit is contained in:
Sandro Jäckel 2021-03-10 10:03:58 +01:00
parent eaff9e7a3e
commit 3d17f64b4e
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@ -4,23 +4,20 @@
, xorgproto, gst_all_1, setfile , xorgproto, gst_all_1, setfile
, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withMesa ? libGLSupported , withMesa ? libGLSupported
, libGLU ? null, libGL ? null , libGLU, libGL
, compat24 ? false, compat26 ? true, unicode ? true , compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true , withGtk2 ? true
, withWebKit ? false, webkitgtk ? null , withWebKit ? false, webkitgtk
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null , AGL, Carbon, Cocoa, Kernel, QTKit
}: }:
with lib; 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."; assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2.";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.5";
pname = "wxwidgets"; pname = "wxwidgets";
version = "3.0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wxWidgets"; owner = "wxWidgets";
@ -29,16 +26,16 @@ stdenv.mkDerivation rec {
sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7";
}; };
nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base
] ++ optionals withGtk2 [ gtk2 ] ] ++ optional withGtk2 gtk2
++ optional (!withGtk2) gtk3 ++ optional (!withGtk2) gtk3
++ optional withMesa libGLU ++ optional withMesa libGLU
++ optional withWebKit webkitgtk ++ optional withWebKit webkitgtk
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = optional stdenv.isDarwin AGL; propagatedBuildInputs = optional stdenv.isDarwin AGL;
patches = [ patches = [