Skip to content

Commit

Permalink
chromiumBeta: Fix the patch phase
Browse files Browse the repository at this point in the history
Upstream dropped use_system_libwayland and related build arguments [0].
The deprecation is tracked in [1].
As a result, we must now build with third_party/wayland instead of
wayland from the system (or complex patches would be required).

This fixes [2].

[0]: https://source.chromium.org/chromium/chromium/src/+/1c3c8db518f78cb2d08a3990e5280e324c4a6e99
[1]: https://bugs.chromium.org/p/chromium/issues/detail?id=1385736
[2]: NixOS#213862 (comment)

(cherry picked from commit 26aadca)
  • Loading branch information
primeos committed Feb 7, 2023
1 parent ca57029 commit b201240
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pkgs/applications/networking/browsers/chromium/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,6 @@ let
host_toolchain = "//build/toolchain/linux/unbundle:default";
# Don't build against a sysroot image downloaded from Cloud Storage:
use_sysroot = false;
# The default value is hardcoded instead of using pkg-config:
system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner";
# Because we use a different toolchain / compiler version:
treat_warnings_as_errors = false;
# We aren't compiling with Chrome's Clang (would enable Chrome-specific
Expand Down Expand Up @@ -295,12 +293,15 @@ let
chrome_pgo_phase = 0;
clang_base_path = "${llvmPackages.clang}";
use_qt = false;
} // lib.optionalAttrs (!chromiumVersionAtLeast "110") {
# The default has changed to false. We'll build with libwayland from
# Nixpkgs for now but might want to eventually use the bundled libwayland
# as well to avoid incompatibilities (if this continues to be a problem
# from time to time):
use_system_libwayland = true;
} // optionalAttrs proprietaryCodecs {
# The default value is hardcoded instead of using pkg-config:
system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner";
} // lib.optionalAttrs proprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
enable_hangout_services_extension = true;
Expand Down

0 comments on commit b201240

Please sign in to comment.