Skip to content

Commit

Permalink
Merge pull request #319332 from emilylange/staging-ninja-1.12-chromiu…
Browse files Browse the repository at this point in the history
…m-M125

[staging-next] chromium: fix building M125 with ninja 1.12
  • Loading branch information
K900 authored Jun 12, 2024
2 parents fddadbd + 83b4a21 commit 2ff09ea
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions pkgs/applications/networking/browsers/chromium/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 2ff09ea

Please sign in to comment.