mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 14:11:36 +00:00
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'
This commit is contained in:
parent
8be566d288
commit
1d961a4c6d
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue