From 73e094bf3cdb836c3afa48bfd3628af980bb6f3e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 30 Apr 2022 15:19:30 +0200 Subject: [PATCH] chromiumBeta: Fix the configuration phase This fixes the following error: configuring ERROR at //infra/orchestrator/BUILD.gn:38:17: Could not read file. pydeps_file = "//third_party/blink/tools/merge_web_test_results.pydeps" ^-------------------------------------------------------- I resolved this to "/build/chromium-102.0.5005.27/third_party/blink/tools/merge_web_test_results.pydeps". See //infra/orchestrator/BUILD.gn:37:1: whence it was called. python_library("blink_merge_web_test_results_py") { ^-------------------------------------------------- See //BUILD.gn:89:5: which caused the file to be included. "//infra/orchestrator:orchestrator_all", ^-------------------------------------- It's a known upstream issue when building from the generated tarballs: - https://bugs.chromium.org/p/chromium/issues/detail?id=1313361 - https://chromium-review.googlesource.com/c/chromium/src/+/3457503 --- pkgs/applications/networking/browsers/chromium/common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d229342de313..e6d24556a0e6 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -162,7 +162,11 @@ let ./patches/widevine-79.patch ]; - postPatch = '' + postPatch = optionalString (chromiumVersionAtLeast "102") '' + # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361: + substituteInPlace BUILD.gn \ + --replace '"//infra/orchestrator:orchestrator_all",' "" + '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do if [ -d "third_party/$lib" ]; then