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

chromiumDev: Unbreak the build by using LLVM 11

Browse Source
This commit is contained in:
Michael Weiss 2020-08-25 23:28:00 +02:00
parent b8fb1e15b9
commit 9a96d71f71
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/networking/browsers/chromium/browser.nix
View File

@ -90,6 +90,5 @@ mkChromiumDerivation (base: rec {
platforms = platforms.linux; platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
timeout = 172800; # 48 hours timeout = 172800; # 48 hours
broken = channel == "dev"; # Requires LLVM 11
}; };
}) })

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

@ -1,4 +1,4 @@
{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 { newScope, config, stdenv, llvmPackages_10, llvmPackages_11
, makeWrapper, ed, gnugrep, coreutils , makeWrapper, ed, gnugrep, coreutils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null , libva ? null
@ -45,6 +45,7 @@ let
}; };
}); });
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") {
llvmPackages = llvmPackages_11;
gnChromium = gn.overrideAttrs (oldAttrs: { gnChromium = gn.overrideAttrs (oldAttrs: {
version = "2020-07-20"; version = "2020-07-20";
src = fetchgit { src = fetchgit {