diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2022-08-25 23:35:33 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2022-08-27 00:04:41 +0200 |
commit | b6b51374fc7508aa4f3d90d24653fbc01ec3d1b3 (patch) | |
tree | 5852b45dc1aec2a1b2f69a095a9f1920f6f61c99 /pkgs/applications/networking/browsers/chromium/common.nix | |
parent | 7851ae607d2eb28682b4c2550c41693c741d7207 (diff) |
chromiumBeta: Fix errors due to incompatible Wayland headers
This "fixes" errors like these: ``` FAILED: obj/third_party/angle/angle_gpu_info_util/SystemInfo_vulkan.o [...] In file included from ../../third_party/wayland/src/src/wayland-client.h:40: /nix/store/an42rhwn6ck2nix6caikrr4rvizknjhh-wayland-1.21.0-dev/include/wayland-client-protocol.h:1040:13: error: use of undeclared identifier 'wl_proxy_marshal_flags' callback = wl_proxy_marshal_flags((struct wl_proxy *) wl_display, ^ [...] /nix/store/an42rhwn6ck2nix6caikrr4rvizknjhh-wayland-1.21.0-dev/include/wayland-client-protocol.h:1392:87: error: use of undeclared identifier 'WL_MARSHAL_FLAG_DESTROY' WL_SHM_POOL_DESTROY, NULL, wl_proxy_get_version((struct wl_proxy *) wl_shm_pool), WL_MARSHAL_FLAG_DESTROY); ^ [...] fatal error: too many errors emitted, stopping now [-ferror-limit=] ``` At least for now (until Chromium updates their bundled Wayland version) it seems best to use the bundled headers/versions to avoid version incompatibility issues (we should hopefully be able to drop use_system_wayland_scanner though).
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1cfc90dd4f145..1bad824b4e59a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -289,6 +289,10 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; + } // optionalAttrs (chromiumVersionAtLeast "105") { + # https://bugs.chromium.org/p/chromium/issues/detail?id=1334390: + use_system_libwayland = false; + use_system_wayland_scanner = false; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; |