Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkgs/tools/text/diffutils/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ stdenv.mkDerivation rec {
/* If no explicit coreutils is given, use the one from stdenv. */
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.
postPatch = if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) 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
'' else null;

configureFlags =
# "pr" need not be on the PATH as a run-time dep, so we need to tell
# configure where it is. Covers the cross and native case alike.
Expand Down