From 1d961a4c6d6015a9adb9283e582f05e45e5fb34e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 26 Feb 2020 19:14:44 +0100 Subject: chromiumDev: Fix the build Building Chromium 82 requires LLVM 10 for the new argument "-fintegrated-cc1". LLVM 9 fails with: clang++: error: unknown argument: '-fintegrated-cc1' --- pkgs/applications/networking/browsers/chromium/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c3522e17379b..8968a10bed00 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, config, stdenv, llvmPackages_9 +{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 , makeWrapper, ed , glib, gtk3, gnome3, gsettings-desktop-schemas , libva ? null @@ -19,8 +19,10 @@ }: let - stdenv = llvmPackages_9.stdenv; - llvmPackages = llvmPackages_9; + llvmPackages = if channel == "dev" + then llvmPackages_10 + else llvmPackages_9; + stdenv = llvmPackages.stdenv; callPackage = newScope chromium; -- cgit 1.4.1