diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-03-15 17:01:32 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-03-15 17:01:32 +0100 |
| commit | 9adcebb1a97ac75b8a2445459f9e3826a7b71a39 (patch) | |
| tree | 79d3122710a830fb74d53485dfd2cd10457f5bb6 /pkgs/applications/networking | |
| parent | 38a03817b03b01dd89c94f0b683b4b445d69e42d (diff) | |
| parent | 1ea6860cc7352ad739c5a4ac2244c5895a60a21b (diff) | |
| download | nixlib-9adcebb1a97ac75b8a2445459f9e3826a7b71a39.tar nixlib-9adcebb1a97ac75b8a2445459f9e3826a7b71a39.tar.gz nixlib-9adcebb1a97ac75b8a2445459f9e3826a7b71a39.tar.bz2 nixlib-9adcebb1a97ac75b8a2445459f9e3826a7b71a39.tar.lz nixlib-9adcebb1a97ac75b8a2445459f9e3826a7b71a39.tar.xz nixlib-9adcebb1a97ac75b8a2445459f9e3826a7b71a39.tar.zst nixlib-9adcebb1a97ac75b8a2445459f9e3826a7b71a39.zip | |
Merge #23917: fix firefox crashes
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/fix-debug.patch | 77 |
2 files changed, 81 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 68e3bf1b2022..71e8d056ebe9 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -30,6 +30,10 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec { inherit sha512; }; + # this patch should no longer be needed in 53 + # from https://bugzilla.mozilla.org/show_bug.cgi?id=1013882 + patches = lib.optional debugBuild ./fix-debug.patch; + buildInputs = [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi diff --git a/pkgs/applications/networking/browsers/firefox/fix-debug.patch b/pkgs/applications/networking/browsers/firefox/fix-debug.patch new file mode 100644 index 000000000000..ba92bbc47403 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/fix-debug.patch @@ -0,0 +1,77 @@ + +# HG changeset patch +# User Michelangelo De Simone <mdesimone@mozilla.com> +# Date 1479198095 28800 +# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a +# Parent 687eac6845a77d2cac5505da9c8912885c2a9e57 +Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau + +MozReview-Commit-ID: IEHesdoU4Sz + +diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in +--- a/b2g/installer/package-manifest.in ++++ b/b2g/installer/package-manifest.in +@@ -570,17 +570,17 @@ + @RESPATH@/components/InputMethod.manifest + #ifdef MOZ_B2G + @RESPATH@/components/inputmethod.xpt + #endif + + @RESPATH@/components/SystemUpdate.manifest + @RESPATH@/components/SystemUpdateManager.js + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJSMaplike.js + #endif + + ; Modules + @RESPATH@/modules/* + +diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in +--- a/browser/installer/package-manifest.in ++++ b/browser/installer/package-manifest.in +@@ -554,17 +554,17 @@ + @RESPATH@/components/PresentationControlService.js + @RESPATH@/components/PresentationDataChannelSessionTransport.js + @RESPATH@/components/PresentationDataChannelSessionTransport.manifest + + ; InputMethod API + @RESPATH@/components/MozKeyboard.js + @RESPATH@/components/InputMethod.manifest + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @RESPATH@/components/TestInterfaceJS.js + @RESPATH@/components/TestInterfaceJS.manifest + @RESPATH@/components/TestInterfaceJSMaplike.js + #endif + + ; [Extensions] + @RESPATH@/components/extensions-toolkit.manifest + @RESPATH@/browser/components/extensions-browser.manifest +diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in +--- a/mobile/android/installer/package-manifest.in ++++ b/mobile/android/installer/package-manifest.in +@@ -381,17 +381,17 @@ + + @BINPATH@/components/CaptivePortalDetectComponents.manifest + @BINPATH@/components/captivedetect.js + + #ifdef MOZ_WEBSPEECH + @BINPATH@/components/dom_webspeechsynth.xpt + #endif + +-#ifdef MOZ_DEBUG ++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG) + @BINPATH@/components/TestInterfaceJS.js + @BINPATH@/components/TestInterfaceJS.manifest + @BINPATH@/components/TestInterfaceJSMaplike.js + #endif + + @BINPATH@/components/nsAsyncShutdown.manifest + @BINPATH@/components/nsAsyncShutdown.js + + |