From 403ce1a9a3624e7b87606b99ea15f531fa17f8e7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 11 Aug 2021 22:57:23 +0200 Subject: [PATCH] chromiumBeta: Build with LLVM 13 --- pkgs/applications/networking/browsers/chromium/common.nix | 8 -------- .../applications/networking/browsers/chromium/default.nix | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8884148228b4..120392d965e6 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -184,14 +184,6 @@ let commit = "60d5e803ef2a4874d29799b638754152285e0ed9"; sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70"; }) - ] ++ lib.optionals (chromiumVersionAtLeast "93") [ - # We need to revert this patch to build M93 with LLVM 12. - (githubPatch { - # Reland "Replace 'blacklist' with 'ignorelist' in ./tools/msan/." - commit = "9d080c0934b848ee4a05013c78641e612fcc1e03"; - sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; - revert = true; - }) ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c157b64de648..db11bda740be 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -38,7 +38,7 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "94") rec { + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "93") rec { llvmPackages = llvmPackages_13; stdenv = llvmPackages.stdenv; });