public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Michael Weiss 2020-02-26 19:14:44 +01:00
parent 8be566d288
commit 1d961a4c6d
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,4 +1,4 @@
{ newScope, config, stdenv, llvmPackages_9 { newScope, config, stdenv, llvmPackages_9, llvmPackages_10
, makeWrapper, ed , makeWrapper, ed
, glib, gtk3, gnome3, gsettings-desktop-schemas , glib, gtk3, gnome3, gsettings-desktop-schemas
, libva ? null , libva ? null
@ -19,8 +19,10 @@
}: }:
let let
stdenv = llvmPackages_9.stdenv; llvmPackages = if channel == "dev"
llvmPackages = llvmPackages_9; then llvmPackages_10
else llvmPackages_9;
stdenv = llvmPackages.stdenv;
callPackage = newScope chromium; callPackage = newScope chromium;