From d1993b45b128f9d669ae10f046de5d87ef0ec2d2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 19 Nov 2023 01:15:19 +0100 Subject: [PATCH] chromium: Fix build with at-spi2-core 2.49 --- .../networking/browsers/chromium/common.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9fd1dd05a7f3..020d902a9812 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -254,6 +254,20 @@ let hash = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M="; revert = true; }) + ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [ + # Fix build with at-spi2-core ≥ 2.49 + # This version is still needed for electron. + (githubPatch { + commit = "fc09363b2278893790d131c72a4ed96ec9837624"; + hash = "sha256-l60Npgs/+0ozzuKWjwiHUUV6z59ObUjAPTfXN7eXpzw="; + }) + ] ++ lib.optionals (!chromiumVersionAtLeast "121.0.6104.0") [ + # Fix build with at-spi2-core ≥ 2.49 + # https://chromium-review.googlesource.com/c/chromium/src/+/5001687 + (githubPatch { + commit = "b9bef8e9555645fc91fab705bec697214a39dbc1"; + hash = "sha256-CJ1v/qc8+nwaHQR9xsx08EEcuVRbyBfCZCm/G7hRY+4="; + }) ]; postPatch = ''