cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

chromium{Beta,Dev}: Use LLVM 12

Browse source 
LLVM 12 is required but the build still fails due to other changes that
where introduced in the meantime (and Chromium 90.0.4430.51 introduced
another LLVM failure).
This commit is contained in:
Michael Weiss 2021-03-27 15:52:40 +01:00
parent 905ecb920e
commit 166520812e
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/browsers/chromium/browser.nix
View file

@ -89,6 +89,6 @@ mkChromiumDerivation (base: rec {
then ["aarch64-linux" "x86_64-linux"] then ["aarch64-linux" "x86_64-linux"]
else []; else [];
timeout = 172800; # 48 hours (increased from the Hydra default of 10h) timeout = 172800; # 48 hours (increased from the Hydra default of 10h)
broken = elem channel [ "beta" "dev" ]; # Build requires LLVM 12 broken = elem channel [ "beta" "dev" ];
}; };
}) })

4
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -1,5 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper { newScope, config, stdenv, fetchurl, makeWrapper
, llvmPackages_11, ed, gnugrep, coreutils, xdg-utils , llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit
, libva ? null , libva ? null
, pipewire , pipewire
@ -39,6 +39,8 @@ let
inherit (upstream-info.deps.gn) url rev sha256; inherit (upstream-info.deps.gn) url rev sha256;
}; };
}); });
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "90") {
llvmPackages = llvmPackages_12;
}); });
browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };