diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-08-25 23:28:00 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-08-26 22:29:07 +0200 |
| commit | 9a96d71f71681bd7addb1fd5e2fe879cbf0e1105 (patch) | |
| tree | f9f624c753217132751885b74420572d2a61d0ec /pkgs/applications/networking/browsers | |
| parent | b8fb1e15b9b452334dde66285b75aef3621c043d (diff) | |
chromiumDev: Unbreak the build by using LLVM 11
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/browser.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 51e3fb032f2b2..7c0609730c249 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -90,6 +90,5 @@ mkChromiumDerivation (base: rec { platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours - broken = channel == "dev"; # Requires LLVM 11 }; }) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index f4ddd755fa153..efaaefce65a2a 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, llvmPackages_10 +{ newScope, config, stdenv, llvmPackages_10, llvmPackages_11 , makeWrapper, ed, gnugrep, coreutils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null @@ -45,6 +45,7 @@ let }; }); } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { + llvmPackages = llvmPackages_11; gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-07-20"; src = fetchgit { |