about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2022-10-25 22:53:56 +0200
committerMichael Weiss <dev.primeos@gmail.com>2022-10-25 23:58:11 +0200
commitf9d9864cb6229c92a7b162441db88dfe61ff5831 (patch)
tree83c4209586239d7b786737bb5e6f22426debff10 /pkgs/applications/networking/browsers
parentd236f69f4d33520cb58add018fa47798ac366ab9 (diff)
chromiumBeta: Fix the build
The build argument `use_system_libwayland_server` was set to `false`
since M107 [0]. This will cause `libwayland` to be built which does in
turn pull in `libffi` ("//build/config/linux/libffi") [1].

Alternatively, we should be able to fix the libffi dependency by setting
`use_system_libffi = true` (recently added, see [2]) and adding `libffi`
to the build inputs.

[0]: https://source.chromium.org/chromium/chromium/src/+/b9cd6d676764374c353240a8b1a8c3267309e57d
[1]: https://source.chromium.org/chromium/chromium/src/+/refs/tags/107.0.5304.62:third_party/wayland/BUILD.gn
[2]: https://source.chromium.org/chromium/chromium/src/+/cf3ee09f082513e48f1212dcebd1e5c7a38ca73f
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 862fc41327560..1759d3fba6aea 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -296,6 +296,7 @@ let
     } // optionalAttrs (chromiumVersionAtLeast "107") {
       clang_base_path = "${llvmPackages.clang}";
       use_qt = false;
+      use_system_libwayland_server = true;
     } // optionalAttrs proprietaryCodecs {
       # enable support for the H.264 codec
       proprietary_codecs = true;