Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnugrep: enable tests on x64 darwin #359106

Closed
wants to merge 1 commit into from
Closed

gnugrep: enable tests on x64 darwin #359106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions pkgs/tools/text/gnugrep/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,19 @@ stdenv.mkDerivation {
hash = "sha256-HbKu3eidDepCsW2VKPiUyNFdrk4ZC1muzHj1qVEnbqs=";
};

postPatch = let
isX64Darwin = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
in
# Some gnulib tests fail
# - on Musl: https://github.com/NixOS/nixpkgs/pull/228714
# - on x86_64-darwin: https://github.com/NixOS/nixpkgs/pull/228714#issuecomment-1576826330
postPatch = if stdenv.hostPlatform.isMusl || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then ''
lib.optionalString (stdenv.hostPlatform.isMusl || isX64Darwin) ''
sed -i 's:gnulib-tests::g' Makefile.in
'' else null;
''
# x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator
+ lib.optionalString isX64Darwin ''
sed -i 1a'exit 0' tests/stack-overflow
'';

nativeCheckInputs = [ perl glibcLocales ];
outputs = [ "out" "info" ]; # the man pages are rather small
Expand All @@ -31,8 +38,9 @@ stdenv.mkDerivation {

# cygwin: FAIL: multibyte-white-space
# freebsd: FAIL mb-non-UTF8-performance
# x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator
doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64;
doCheck = !stdenv.hostPlatform.isCygwin
&& !stdenv.hostPlatform.isFreeBSD
&& !stdenv.buildPlatform.isRiscV64;

# On macOS, force use of mkdir -p, since Grep's fallback
# (./install-sh) is broken.
Expand Down