From 75684ee6c21838a719cf207726a7e00fc3b770bd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 16 Dec 2023 21:21:00 +0000 Subject: [PATCH] iwd: fix unit/test-dpp for aarch64-linux (upstream backport) Without the change `iwd` sometimes sends more bytes to encrypt than expected and fails tests on `aarch64-linux`. --- pkgs/os-specific/linux/iwd/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index bea03fc1e8a2..e54916f45901 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -22,13 +22,12 @@ stdenv.mkDerivation rec { hash = "sha256-kE9GBVTKNpgEuE9jQ7k85OhEAN3VWgjmAgifvZfq46I="; }; - # Revert test that's broken on aarch64 - # FIXME: fix this properly patches = [ + # Fix unit/test-dpp on aarch64. (fetchpatch { - url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=aabedeeb6c20c0c053f11ef53413d542442a8f62"; - revert = true; - hash = "sha256-hO4KzdLzW6Tn/4NNJEQO2OvgjSPVl46cwwZfv53R84U="; + name = "size_t-vararg.patch"; + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=688d27700833258a139a6fbd5661334bd2c9fa98"; + hash = "sha256-g3gG1c25o6ODFfHL4a0HcnNJBBOKRbdo+ZuVbzoxCLs="; }) ];