diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-02-26 19:14:44 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-02-26 19:21:59 +0100 |
| commit | 1d961a4c6d6015a9adb9283e582f05e45e5fb34e (patch) | |
| tree | f7d39729c0bb5d432446718bfa036ea1122f7a02 /pkgs/applications/networking/browsers/chromium/default.nix | |
| parent | 8be566d288d3dce263394e68a10dc5852fcf24e8 (diff) | |
| download | nixpkgs-1d961a4c6d6015a9adb9283e582f05e45e5fb34e.tar nixpkgs-1d961a4c6d6015a9adb9283e582f05e45e5fb34e.tar.gz nixpkgs-1d961a4c6d6015a9adb9283e582f05e45e5fb34e.tar.bz2 nixpkgs-1d961a4c6d6015a9adb9283e582f05e45e5fb34e.tar.lz nixpkgs-1d961a4c6d6015a9adb9283e582f05e45e5fb34e.tar.xz nixpkgs-1d961a4c6d6015a9adb9283e582f05e45e5fb34e.tar.zst nixpkgs-1d961a4c6d6015a9adb9283e582f05e45e5fb34e.zip | |
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'
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c3522e17379..8968a10bed0 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; |