Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 1fbc28c5f621
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c7a503bf2e9b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 5, 2020

  1. Revert "chromiumDev: 86.0.4240.8 -> 87.0.4252.0"

    This reverts commit 5da6656.
    
    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
    ```
    flokli committed Sep 5, 2020
    Copy the full SHA
    c7a503b View commit details
    Browse the repository at this point in the history