diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 14:01:19 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-12-11 14:01:19 -0500 |
| commit | 07a8ae0c5a7daa0a6aa12c901ebc95013f122c85 (patch) | |
| tree | 2e462acd400154007e8c7552d2a2dd1441d61032 /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 268f87011a2d1f344fb09dd594895c5807414079 (diff) | |
| parent | c71b1bb92cc57e74ef98fd2def486f5e82a12586 (diff) | |
Merge branch 'staging-next' into staging
Conflicts: pkgs/development/libraries/log4cplus/default.nix
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index b0d11bd835b62..041082484571b 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -132,13 +132,8 @@ buildStdenv.mkDerivation ({ patches = [ ] ++ 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="; - }) ++ + lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ + lib.optional (lib.versionAtLeast version "95") ./no-buildconfig-ffx95.patch ++ patches; # Ignore trivial whitespace changes in patches, this fixes compatibility of @@ -297,6 +292,7 @@ buildStdenv.mkDerivation ({ ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] ++ lib.optional enableOfficialBranding "--enable-official-branding" + ++ lib.optional (lib.versionAtLeast version "95") "--without-wasm-sandboxed-libraries" ++ extraConfigureFlags; postConfigure = '' |