dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #236229 from trofi/gnugrep-parallel

Browse Source 
gnugrep: enable parallel build and tests
This commit is contained in:
Sergei Trofimovich 2023-06-11 18:03:32 +01:00 committed by GitHub
commit a4d88eeaee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/text/gnugrep/default.nix
View File

@ -16,8 +16,10 @@ stdenv.mkDerivation {
hash = "sha256-HbKu3eidDepCsW2VKPiUyNFdrk4ZC1muzHj1qVEnbqs=";
};
# Some gnulib tests fail on Musl: https://github.com/NixOS/nixpkgs/pull/228714
postPatch = if stdenv.hostPlatform.isMusl then ''
# 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 ''
sed -i 's:gnulib-tests::g' Makefile.in
'' else null;
@ -28,7 +30,8 @@ stdenv.mkDerivation {
# cygwin: FAIL: multibyte-white-space
# freebsd: FAIL mb-non-UTF8-performance
doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD;
# x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator
doCheck = !stdenv.isCygwin && !stdenv.isFreeBSD && !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64);
# On macOS, force use of mkdir -p, since Grep's fallback
# (./install-sh) is broken.
@ -36,6 +39,8 @@ stdenv.mkDerivation {
export MKDIR_P="mkdir -p"
'';
enableParallelBuilding = true;
# Fix reference to sh in bootstrap-tools, and invoke grep via
# absolute path rather than looking at argv[0].
postInstall =