From ef3f747b968593c28a0480cb2eee80c65522b839 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 24 Sep 2026 17:39:23 +0300
Subject: [PATCH] libhwy: backport GCC 16/aarch64 build fix

---
 pkgs/by-name/li/libhwy/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/libhwy/package.nix b/pkgs/by-name/li/libhwy/package.nix
index c458e1092ee8..3eb2fef6a695 100644
--- a/pkgs/by-name/li/libhwy/package.nix
+++ b/pkgs/by-name/li/libhwy/package.nix
@@ -5,6 +5,7 @@
   ninja,
   gtest,
   fetchFromGitHub,
+  fetchpatch,
   testers,
   nix-update-script,
 }:
@@ -29,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./move-contrib-to-its-own-output.patch
+  ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+    # backport GCC 16/aarch64 fix
+    (fetchpatch {
+      url = "https://github.com/google/highway/commit/8a0da774fe6b3f9ab02f5f33e763b8c2133f38fc.patch";
+      hash = "sha256-uAWBtQWE/iSFK0Ht3rWV+kpSH/UPQr8nlM9AWBFu0Vg=";
+    })
   ];
 
   hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [