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

re2: enable parallel builds (#147991)

Browse Source
This commit is contained in:
Sergei Trofimovich 2021-11-30 09:33:42 +00:00 committed by GitHub
parent 7b031d0d99
commit 716815ce2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/re2/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub }: { lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "re2"; pname = "re2";
@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "1fyhypw345xz8zdh53gz6j1fwgrx0gszk1d349ja37dpxh4jp2jh"; 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 = '' preConfigure = ''
substituteInPlace Makefile --replace "/usr/local" "$out" substituteInPlace Makefile --replace "/usr/local" "$out"
# we're using gnu sed, even on darwin # we're using gnu sed, even on darwin
@ -19,6 +28,8 @@ stdenv.mkDerivation rec {
buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ]; buildFlags = lib.optionals stdenv.hostPlatform.isStatic [ "static" ];
enableParallelBuilding = true;
preCheck = "patchShebangs runtests"; preCheck = "patchShebangs runtests";
doCheck = true; doCheck = true;
checkTarget = "test"; checkTarget = "test";