diff options
| author | K900 <me@0upti.me> | 2024-06-12 17:11:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 17:11:04 +0300 |
| commit | 2ff09eadf5a41ffd4c1054c606a9455f974753a0 (patch) | |
| tree | 4a2f0e450dcfbb91971bfcee50521c29153111a7 | |
| parent | fddadbd2340aeff204b094f2c7a30205dff08389 (diff) | |
| parent | 83b4a2178fb79a24a27f53e72f28b11ba27f2835 (diff) | |
Merge pull request #319332 from emilylange/staging-ninja-1.12-chromium-M125
[staging-next] chromium: fix building M125 with ninja 1.12
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 8 |
1 files changed, 8 insertions, 0 deletions
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): |