From dcad8f1654e4d9f5b802f8112534ebd370629fae Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 16 Feb 2018 13:59:11 +0000 Subject: [PATCH] firefox: patch to fix bug 1430274 (broken ALSA output) in 58, add more comments --- .../networking/browsers/firefox/packages.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4cb997031cf7..44f4b014d70b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -12,12 +12,23 @@ rec { sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f"; }; - patches = - [ ./no-buildconfig.patch ./env_var_for_system_dir.patch ] - ++ lib.optional stdenv.isi686 (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; - sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; - }); + patches = [ + ./no-buildconfig.patch + ./env_var_for_system_dir.patch + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1430274 + # Scheduled for firefox 59 + (fetchpatch { + url = "https://bug1430274.bmoattachments.org/attachment.cgi?id=8943426"; + sha256 = "12yfss3k61yilrb337dh2rffy5hh83d2f16gqrf5i56r9c33f7hf"; + }) + + # https://bugzilla.mozilla.org/show_bug.cgi?id=1388981 + # Should have been fixed in firefox 57 + ] ++ lib.optional stdenv.isi686 (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; + sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; + }); meta = { description = "A web browser built from Firefox source tree";