Skip to content

Commit

Permalink
chromiumDev: Unbreak the build by using LLVM 11
Browse files Browse the repository at this point in the history
  • Loading branch information
primeos committed Aug 26, 2020
1 parent b8fb1e1 commit 9a96d71
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion pkgs/applications/networking/browsers/chromium/browser.nix
Expand Up @@ -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
};
})
3 changes: 2 additions & 1 deletion 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
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 9a96d71

Please sign in to comment.