git.iko.soy/typeable/nixpkgs
on master help sign in
chromiumDev: Build without TFLite and apply a fix

During d6d4228b39b I failed to notice that the current chromiumDev version is older than the first one that contained the commit to fix the dependency on opus in webcodecs. This should hopefully fix build of chromiumDev (if there are no additional issues).

commitd1c040f8c6139ff47f2508a9f762640078cec69c authorMichael Weiss <dev.primeos@gmail.com> dateMon 1 Feb 2021, 01:25 (6 years ago) parent800b760
1 file changed+8−2
pkgs/applications/networking/browsers/chromium/common.nix+8−2
pkgs/applications/networking/browsers/chromium/common.nix+8−2
@@ -153,8 +153,8 @@ let
153153 ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed)
154154 ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags
155155 # ++ optional (versionRange "68" "72") (githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
156− ] ++ optional (versionRange "89" "90") (githubPatch
157− # To fix the build of chromiumBeta:
156+ ] ++ optional (versionRange "89" "90.0.4402.0") (githubPatch
157+ # To fix the build of chromiumBeta and chromiumDev:
158158 "b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9" # add dependency on opus in webcodecs
159159 "1r4wmwaxz5xbffmj5wspv2xj8s32j9p6jnwimjmalqg3al2ba64x"
160160 );
@@ -279,6 +279,12 @@ let
279279 # Disable PGO (defaults to 2 since M89) because it fails without additional changes:
280280 # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version
281281 chrome_pgo_phase = 0;
282+ } // optionalAttrs (chromiumVersionAtLeast "90") {
283+ # Disable build with TFLite library because it fails without additional changes:
284+ # ninja: error: '../../chrome/test/data/simple_test.tflite', needed by 'test_data/simple_test.tflite', missing and no known rule to make it
285+ # Note: chrome/test/data/simple_test.tflite is in the Git repository but not in chromium-90.0.4400.8.tar.xz
286+ # See also chrome/services/machine_learning/README.md
287+ build_with_tflite_lib = false;
282288 } // optionalAttrs ungoogled {
283289 chrome_pgo_phase = 0;
284290 enable_hangout_services_extension = false;