From 83b4a2178fb79a24a27f53e72f28b11ba27f2835 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 12 Jun 2024 15:57:37 +0200 Subject: chromium: fix building M125 with ninja 1.12 Solves the following build error: ~~~ FAILED: obj/chrome/browser/devtools/devtools/devtools_window.o In file included from ../../chrome/browser/devtools/devtools_window.cc:32: ../../chrome/browser/file_select_helper.h:16:10: fatal error: 'components/enterprise/buildflags/buildflags.h' file not found 16 | #include "components/enterprise/buildflags/buildflags.h" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~ Can be removed once chromium and ungoogled-chromium are both on M126, since the patch is from M126. https://issues.chromium.org/issues/336911498 https://chromium-review.googlesource.com/c/chromium/src/+/5487538 --- pkgs/applications/networking/browsers/chromium/common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a7955b7e61f23..936d3bd75c5d7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -259,6 +259,14 @@ let # We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn # flag (declare_args) so we simply hardcode it to false. ./patches/widevine-disable-auto-download-allow-bundle.patch + ] ++ lib.optionals (versionRange "125" "126") [ + # Fix building M125 with ninja 1.12. Not needed for M126+. + # https://issues.chromium.org/issues/336911498 + # https://chromium-review.googlesource.com/c/chromium/src/+/5487538 + (githubPatch { + commit = "a976cb05b4024b7a6452d1541378d718cdfe33e6"; + hash = "sha256-K2PSeJAvhGH2/Yp63/4mJ85NyqXqDDkMWY+ptrpgmOI="; + }) ] ++ [ # Required to fix the build with a more recent wayland-protocols version # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): -- cgit 1.4.1