diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2022-04-30 15:19:30 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2022-05-26 11:54:44 +0200 |
| commit | 54e391808c2c8e8893b414d7db5d9b02bf97007e (patch) | |
| tree | 5f5cc79419e3d336d30d5bb2d754597e96b00770 | |
| parent | google-chrome: remove legacy ? null (diff) | |
| download | nixpkgs-54e391808c2c8e8893b414d7db5d9b02bf97007e.tar.gz | |
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
(cherry picked from commit 73e094bf3cdb836c3afa48bfd3628af980bb6f3e)
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3904f66ad50e..d6ae683af732 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 |