firefox-gtk3: fix crashes by a Fedora-backported patch

These might be the same crashes as with gtk2 and system cairo #9368.
This commit is contained in:
Vladimír Čunát 2015-09-01 15:17:05 +02:00
parent f65b692a07
commit f2d25c5a4d

View file

@ -4,7 +4,7 @@
, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
, hunspell, libevent, libstartup_notification, libvpx
, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
, enableGTK3 ? false
, enableGTK3 ? false, fetchpatch
, debugBuild ? false
, # If you want the resulting program to call itself "Firefox" instead
# of "Shiretoko" or whatever, enable this option. However, those
@ -26,6 +26,17 @@ stdenv.mkDerivation rec {
sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";
};
patches = if !enableGTK3 then null else [(fetchpatch {
name = "crash_OTMC+GTK3.patch";
# backported from 40.1
# https://bugzilla.mozilla.org/show_bug.cgi?id=1127752
# https://bugzilla.redhat.com/show_bug.cgi?id=1256875
url = "http://pkgs.fedoraproject.org/cgit/firefox.git/plain/"
+ "mozilla-1127752.patch?id=571fefe2c8f741b92c865e9122af56f6258b3fc1";
sha256 = "04yq4lcq8ln2fmknz4c0zah77wxqp2mcgr8pjx860dmcmzvyi3p5";
})];
patchFlags = "-p2";
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi