mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 23:22:37 +00:00
firefox: Drop crash_OTMC+GTK3.patch.
The patch only applies for Firefox versions between 37.0 and 40.1. Because we're on version 41.0 the changes are already included upstream and thus the patch doesn't apply and is even unnecessary. As for version 38.3 for ESR, the patch doesn't apply as well if compiled with enableGTK3. Of course, this is a bit unfortunate but I don't have the time right now to properly rebase the patch on 38.3. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Reported-by: devhell <"^"@regexmail.net>
This commit is contained in:
parent
baf1d1dcd7
commit
592f0f7ead
@ -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, fetchpatch
|
||||
, enableGTK3 ? false
|
||||
, debugBuild ? false
|
||||
, # If you want the resulting program to call itself "Firefox" instead
|
||||
# of "Shiretoko" or whatever, enable this option. However, those
|
||||
@ -28,17 +28,6 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec {
|
||||
inherit sha1;
|
||||
};
|
||||
|
||||
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 xorg.libXi
|
||||
|
Loading…
Reference in New Issue
Block a user