lol

wxwidgets_3: remove ? null from inputs, format

+7 -10
+7 -10
pkgs/development/libraries/wxwidgets/3.0/default.nix
··· 4 4 , xorgproto, gst_all_1, setfile 5 5 , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms 6 6 , withMesa ? libGLSupported 7 - , libGLU ? null, libGL ? null 7 + , libGLU, libGL 8 8 , compat24 ? false, compat26 ? true, unicode ? true 9 9 , withGtk2 ? true 10 - , withWebKit ? false, webkitgtk ? null 11 - , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null 10 + , withWebKit ? false, webkitgtk 11 + , AGL, Carbon, Cocoa, Kernel, QTKit 12 12 }: 13 13 14 14 with lib; 15 - 16 - assert withMesa -> libGLU != null && libGL != null; 17 - assert withWebKit -> webkitgtk != null; 18 15 19 16 assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2."; 20 17 21 18 stdenv.mkDerivation rec { 22 - version = "3.0.5"; 23 19 pname = "wxwidgets"; 20 + version = "3.0.5"; 24 21 25 22 src = fetchFromGitHub { 26 23 owner = "wxWidgets"; ··· 28 25 rev = "v${version}"; 29 26 sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; 30 27 }; 28 + 29 + nativeBuildInputs = [ pkg-config ]; 31 30 32 31 buildInputs = [ 33 32 libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base 34 - ] ++ optionals withGtk2 [ gtk2 ] 33 + ] ++ optional withGtk2 gtk2 35 34 ++ optional (!withGtk2) gtk3 36 35 ++ optional withMesa libGLU 37 36 ++ optional withWebKit webkitgtk 38 37 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; 39 - 40 - nativeBuildInputs = [ pkg-config ]; 41 38 42 39 propagatedBuildInputs = optional stdenv.isDarwin AGL; 43 40