Skip to content

[staging-next] firefox: use rustc.llvmPackages.stdenv with LLVM bintools, fix deadlock #145459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sternenseemann merged 2 commits into from
Nov 13, 2021
Merged

[staging-next] firefox: use rustc.llvmPackages.stdenv with LLVM bintools, fix deadlock #145459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0283a68
firefox: use rustc.llvmPackages.stdenv with bintools
oxalica Nov 13, 2021
57fa7ae
firefox: add a patch fixing deadlock
oxalica Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkgs/applications/networking/browsers/firefox/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ let
# When LTO for Darwin is fixed, the following will need updating as lld
# doesn't work on it. For now it is fine since ltoSupport implies no Darwin.
buildStdenv = if ltoSupport
then overrideCC stdenv llvmPackages.clangUseLLVM
# LTO requires LLVM bintools including ld.lld and llvm-ar.
then overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
inherit (llvmPackages) bintools;
})
else stdenv;

# --enable-release adds -ffunction-sections & LTO that require a big amount of
Expand All @@ -131,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
Expand Down