dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chromium: fix building M125 with ninja 1.12

Browse Source 
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
This commit is contained in:
emilylange 2024-06-12 15:57:37 +02:00
parent fddadbd234
commit 83b4a2178f
No known key found for this signature in database
GPG Key ID: 0AD773CE46FD0F87
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -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):