From 9d05d42f4d61f28207eef3492115168739cdc442 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Nov 2022 18:52:22 +0100 Subject: [PATCH] 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; and f9d9864cb62 will become relevant again when we build with the bundled libwayland). [0]: https://source.chromium.org/chromium/chromium/src/+/b33bdfe2654df61dee900e7b85cc3fcaea6b65a3 [1]: https://source.chromium.org/chromium/chromium/src/+/272220cefa2cff8cf9273a02155454650e79e024 --- pkgs/applications/networking/browsers/chromium/common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 39a2f3d18369..523a9b251809 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -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;