3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #213865 from primeos/chromiumBeta

chromiumBeta: Fix the patch phase
This commit is contained in:
Michael Weiss 2023-02-01 00:14:52 +01:00 committed by GitHub
commit f5a9697c77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -258,8 +258,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
@ -293,11 +291,14 @@ 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;
# 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;