From 6a77457e9b11c97d5ab2928e69d2ce6995a563f3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 23 Apr 2025 00:18:57 +0100
Subject: [PATCH 1/2] diffutils: skip tests more robustly

---
 pkgs/tools/text/diffutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 79c90f5a061b..21a493dc4a2b 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
       ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32))
     then
       ''
-        sed -i -E 's:test-c-stack2?\.sh::g' gnulib-tests/Makefile.in
-        sed -i -E 's:test-sigsegv-catch-stackoverflow[12]::g' gnulib-tests/Makefile.in
+        sed -i -E 's:[[:space:]]test-c-stack2?\.sh::g' gnulib-tests/Makefile.in
+        sed -i -E 's:[[:space:]]test-sigsegv-catch-stackoverflow[12]\$\(EXEEXT\)::g' gnulib-tests/Makefile.in
       ''
     else
       null;

From 6c133b163291d87e9f710530e48f8693195c46ba Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 23 Apr 2025 00:18:57 +0100
Subject: [PATCH 2/2] diffutils: skip `test-sigaction` on `x86_64-darwin`

More Rosetta 2 issues. AArch32 can continue coming along for the ride,
I guess.
---
 pkgs/tools/text/diffutils/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 21a493dc4a2b..d62684b2569c 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ coreutils ];
 
   # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under
-  # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow fails.
+  # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow and test-sigaction fail.
   postPatch =
     if
       ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32))
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
       ''
         sed -i -E 's:[[:space:]]test-c-stack2?\.sh::g' gnulib-tests/Makefile.in
         sed -i -E 's:[[:space:]]test-sigsegv-catch-stackoverflow[12]\$\(EXEEXT\)::g' gnulib-tests/Makefile.in
+        sed -i -E 's:[[:space:]]test-sigaction\$\(EXEEXT\)::g' gnulib-tests/Makefile.in
       ''
     else
       null;