mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
chromiumBeta: Fix the configuration phase
Upstream switched use_system_libwayland to false [0] and system_wayland_scanner_path will now only be declared if use_system_wayland_scanner is set to true (it defaults to use_system_libwayland) [1]. In Nixpkgs, we usually try to set use_system_* to true (i.e., we favor system libraries over bundled/vendored ones) but in the case of Chromium this can become difficult to maintain so we might eventually drop `use_system_libwayland = true` again (IIRC this only caused one incompatibility in the past though: b6b51374fc7; andf9d9864cb6
will become relevant again when we build with the bundled libwayland). [0]:b33bdfe265
[1]:272220cefa
This commit is contained in:
parent
a115bb9bd5
commit
9d05d42f4d
@ -295,7 +295,14 @@ let
|
||||
chrome_pgo_phase = 0;
|
||||
clang_base_path = "${llvmPackages.clang}";
|
||||
use_qt = false;
|
||||
} // optionalAttrs (!chromiumVersionAtLeast "108") {
|
||||
use_system_libwayland_server = true;
|
||||
} // optionalAttrs (chromiumVersionAtLeast "108") {
|
||||
# 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 {
|
||||
# enable support for the H.264 codec
|
||||
proprietary_codecs = true;
|
||||
|
Loading…
Reference in New Issue
Block a user