From d6d4228b39b7bd71ea64f597359612ff9557f4f8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 29 Jan 2021 13:14:37 +0100 Subject: chromiumBeta: Backport a patch to fix the build The build was failing with: In file included from ../../third_party/blink/renderer/modules/webcodecs/audio_encoder.cc:7: In file included from ../../media/audio/audio_opus_encoder.h:16: gen/shim_headers/opus_shim/third_party/opus/src/include/opus.h:5:10: error: 'opus.h' file not found with include; use "quotes" instead #include ^~~~~~~~ "opus.h" [...] fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated. [42272/44233] CXX obj/third_party/blink/renderer/modules/webcodecs/webcodecs/decoder_template.oo[K Note: This also fixes the ungoogled-chromium channel name in versionRange. --- pkgs/applications/networking/browsers/chromium/common.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index acf1e6a7ee67..7d54db22fa8a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -106,7 +106,7 @@ let versionRange = min-version: upto-version: let inherit (upstream-info) version; result = versionAtLeast version min-version && versionOlder version upto-version; - ungoogled-version = (importJSON ./upstream-info.json).ungoogled.version; + ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version; in if versionAtLeast ungoogled-version upto-version then warn "chromium: ungoogled version ${ungoogled-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." result @@ -152,8 +152,12 @@ let patches = [ ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags - # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ]; + # ++ optional (versionRange "68" "72") (githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000") + ] ++ optional (versionRange "89" "90") (githubPatch + # To fix the build of chromiumBeta: + "b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs + "1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x" + ); postPatch = '' # remove unused third-party -- cgit v1.2.3