From c7a503bf2e9b20cff9140df2586f15654cce874d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 5 Sep 2020 12:00:48 +0200 Subject: [PATCH] Revert "chromiumDev: 86.0.4240.8 -> 87.0.4252.0" This reverts commit 5da66561d1afa4c99c3ba54fc27268b206253188. It seems the chromium build now unconditionally tries to enable ozone (even though we disable it), causing the build to fail (as we only provide xkbcommon when enabling Ozone): ``` configuring ERROR at //build/config/linux/pkg_config.gni:103:17: Script returned non-zero exit code. pkgresult = exec_script(pkg_config_script, args, "value") ^---------- Current dir: /build/chromium-87.0.4252.0/out/Release/ Command: python /build/chromium-87.0.4252.0/build/config/linux/pkg-config.py xkbcommon Returned 1. stderr: Package xkbcommon was not found in the pkg-config search path. Perhaps you should add the directory containing `xkbcommon.pc' to the PKG_CONFIG_PATH environment variable No package 'xkbcommon' found Could not run pkg-config. See //ui/events/ozone/layout/BUILD.gn:12:3: whence it was called. pkg_config("xkbcommon") { ^------------------------ See //chrome/test/chromedriver/BUILD.gn:273:15: which caused the file to be included. deps += [ "//ui/events/ozone/layout" ] ^------------------------- builder for '/nix/store/2dqhrd2qzyms078wnvwv6ays53ppvgc2-chromium-unwrapped-87.0.4252.0.drv' failed with exit code 1 cannot build derivation '/nix/store/4iyhgzsmpx80v75hvk1jycwzanw4z5dn-chromium-dev-87.0.4252.0.drv': 1 dependencies couldn't be built ``` --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index ae8dd975370..6365a4eafd6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -5,9 +5,9 @@ "sha256bin64": "05qdzkq9daqjliqj7zxsa03903rv3kwaj627192ls6m33bacz9gp" }, "dev": { - "version": "87.0.4252.0", - "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y", - "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw" + "version": "86.0.4240.8", + "sha256": "1x0kbc7xp6599jyn461mbmchbixivnxm0jsyfq0snhxz8x81z55q", + "sha256bin64": "0y7drzxxfn0vmfq0m426l8xvkgyajb8pjydi0d7kzk6i92sjf45j" }, "stable": { "version": "85.0.4183.83",