From 166520812e9127532a64ed1707f2a978d2edcd9b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 27 Mar 2021 15:52:40 +0100 Subject: [PATCH] chromium{Beta,Dev}: Use LLVM 12 LLVM 12 is required but the build still fails due to other changes that where introduced in the meantime (and Chromium 90.0.4430.51 introduced another LLVM failure). --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- pkgs/applications/networking/browsers/chromium/default.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 989368f198ca..1fecadc2ec0b 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -89,6 +89,6 @@ mkChromiumDerivation (base: rec { then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) - broken = elem channel [ "beta" "dev" ]; # Build requires LLVM 12 + broken = elem channel [ "beta" "dev" ]; }; }) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c1b5711b02e4..1ad7bc8bfa88 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_11, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire @@ -39,6 +39,8 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "90") { + llvmPackages = llvmPackages_12; }); browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };