From 2774c726b4d8a922de19add521ae904673b07ebb Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 13 Nov 2021 07:33:44 +0800 Subject: [PATCH] firefox: add a patch fixing deadlock --- pkgs/applications/networking/browsers/firefox/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 0326e2f0ecaf..1c0832e32ca2 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -134,6 +134,12 @@ buildStdenv.mkDerivation ({ ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "90") ./no-buildconfig-ffx90.patch ++ + # This fixes a race condition causing deadlock. + # https://phabricator.services.mozilla.com/D128657 + lib.optional (lib.versionAtLeast version "94") (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9c7f25d45bb1dd6b1a865780bc249cdaa619aa83/trunk/0002-Bug-1735905-Upgrade-cubeb-pulse-to-fix-a-race-condit.patch"; + sha256 = "l4bMK/YDXcDpIjPy9DPuUSFyDpzVQca201A4h9eav5g="; + }) ++ patches; # Ignore trivial whitespace changes in patches, this fixes compatibility of