diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2021-11-30 09:33:42 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-30 04:33:42 -0500 |
commit | 716815ce2a1fcb135843c7441648a59d62fb6eb6 (patch) | |
tree | 8e38ad311d0248c968412ea1194d51136dd7b42d /pkgs/development/libraries/re2 | |
parent | 7b031d0d99e8cdaf0b70457c0cb33f16c0c958bb (diff) |
re2: enable parallel builds (#147991)
Diffstat (limited to 'pkgs/development/libraries/re2')
-rw-r--r-- | pkgs/development/libraries/re2/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index d2942e6be2a09..a70ad0f69e036 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "re2"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1fyhypw345xz8zdh53gz6j1fwgrx0gszk1d349ja37dpxh4jp2jh"; }; + patches = [ + # Pull upstreal fix for parallel testing. + (fetchpatch { + name = "parallel-tests.patch"; + url = "https://github.com/google/re2/commit/9262284a7edc1b83e7172f4ec2d7967d695e7420.patch"; + sha256 = "1knhfx9cs4841r09jw4ha6mdx9qwpvlcxvd04i8vr84kd0lilqms"; + }) + ]; + preConfigure = '' substituteInPlace Makefile --replace "/usr/local" "$out" # we're using gnu sed, even on darwin @@ -19,6 +28,8 @@ stdenv.mkDerivation rec { buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ]; + enableParallelBuilding = true; + preCheck = "patchShebangs runtests"; doCheck = true; checkTarget = "test"; |