From b29f28a0eb09871cee6535e8669911e3cfe0b91b Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 25 Dec 2024 14:33:46 +0300 Subject: [PATCH] qt6.qtwebengine: backport aarch64 build fix for xnnpack --- .../libraries/qt-6/modules/qtwebengine/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 149e02e99c68..1a7da3ed6c67 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -66,6 +66,7 @@ bootstrap_cmds, cctools, xcbuild, + fetchpatch, }: qtModule { @@ -114,6 +115,15 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ./locales-path.patch + + # Fix build of vendored xnnpack on aarch64/gcc14 + # FIXME: remove when upstream updates + (fetchpatch { + url = "https://github.com/google/XNNPACK/commit/1b11a8b0620afe8c047304273674c4c57c289755.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/chromium/third_party/xnnpack/src/"; + hash = "sha256-GUESVNR88I1K2V5xr0e09ec4j2eselMhNN06+PCcINM="; + }) ]; postPatch =