wxGTK30: fix build with gcc 6
This commit is contained in:
parent
0f3cee15b5
commit
90fc5042ad
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
|
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm
|
||||||
, gstreamer, gst_plugins_base, GConf, setfile
|
, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile
|
||||||
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
|
, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
|
||||||
, withWebKit ? false, webkitgtk2 ? null
|
, withWebKit ? false, webkitgtk2 ? null
|
||||||
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
|
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
|
||||||
@ -33,6 +33,11 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
propagatedBuildInputs = optional stdenv.isDarwin AGL;
|
propagatedBuildInputs = optional stdenv.isDarwin AGL;
|
||||||
|
|
||||||
|
patches = [ (fetchpatch {
|
||||||
|
url = "https://raw.githubusercontent.com/jessehager/MINGW-packages/af6ece963d8157dd3fbc710bcc190647c4924c63/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch";
|
||||||
|
sha256 = "0100pg0z7i6cjyysf2k3330pmqmdaxgc9hz6kxnfvc31dynjcq3h";
|
||||||
|
}) ];
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
|
[ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
|
||||||
(if compat24 then "--enable-compat24" else "--disable-compat24")
|
(if compat24 then "--enable-compat24" else "--disable-compat24")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user