3
0
Fork 0
forked from mirrors/nixpkgs

chromiumBeta: Fix the build (#119087)

This commit is contained in:
Michael Weiss 2021-04-11 10:43:29 +02:00 committed by GitHub
parent 0062afc050
commit 5d775bb2b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 2 deletions

View file

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

View file

@ -159,7 +159,9 @@ let
) ++ optional (versionRange "89" "90.0.4422.0") (fetchpatch {
url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch";
sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny";
});
}) ++ optional (chromiumVersionAtLeast "90")
./fix-missing-atspi2-dependency.patch
;
postPatch = ''
# remove unused third-party

View file

@ -0,0 +1,26 @@
From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 10 Apr 2021 13:53:50 +0200
Subject: [PATCH] Fix a missing atspi2 dependency
See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for
more details.
---
content/public/browser/BUILD.gn | 1 +
1 file changed, 1 insertion(+)
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 7e7c436d90c7..20ef832f1d8c 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -535,6 +535,7 @@ source_set("browser_sources") {
if (use_atk) {
sources += [ "ax_inspect_factory_auralinux.cc" ]
+ configs += [ "//build/config/linux/atspi2" ]
}
if (is_linux || is_chromeos) {
--
2.20.1