From ed2b047dfecd9559aa7aaef084654cff9b2e88f6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 18 Feb 2022 21:28:37 +0100 Subject: [PATCH] chromium{Beta,Dev}: Switch to LLVM 14 This fixes the following build error: [24751/48400] ACTION //components/url_formatter/spoof_checks/top_domains:generate_top_domain_list_variables_file(//build/toolchain/linux/unbundle:default)d_tmp/browser_command.mojom-webui.js.mojom-webui.jsui.js FAILED: gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc python3 ../../build/gn_run_binary.py make_top_domain_list_variables ../../components/url_formatter/spoof_checks/top_domains/domains.list top500_domains gen/components/url_formatter/spoof_checks/top_domains/top500-domains-inc.cc make_top_domain_list_variables failed with exit code -4 The "make_top_domain_list_variables" program fails due to a SIGILL error (illegal instruction). See: - https://bugs.chromium.org/p/chromium/issues/detail?id=1273966 - https://reviews.llvm.org/D115015 - https://bugs.chromium.org/p/chromium/issues/detail?id=1269407 (cherry picked from commit c0952b6478194c01081d338b46402803cbfd14a6) --- pkgs/applications/networking/browsers/chromium/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e3b4266c3937..e645a1f5f6c8 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -54,6 +54,9 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); + } // lib.optionalAttrs (chromiumVersionAtLeast "99") rec { + llvmPackages = llvmPackages_14; + stdenv = llvmPackages_14.stdenv; }); browser = callPackage ./browser.nix {