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

Merge pull request #330373 from tobim/pkgs/re2-2024-07

Browse Source 
re2: fix static, always build tests
This commit is contained in:
Azat Bahawi 2024-07-28 09:29:58 +00:00 committed by GitHub
commit 1c39ed2403
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,20 +36,19 @@ stdenv.mkDerivation (finalAttrs: {
ninja
];
buildInputs = lib.optionals finalAttrs.doCheck [
buildInputs = [
gbenchmark
gtest
];
propagatedBuildInputs = [
abseil-cpp
icu
];
propagatedBuildInputs = [ abseil-cpp ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ icu ];
cmakeFlags = [
(lib.cmakeBool "RE2_BUILD_TESTING" finalAttrs.doCheck)
(lib.cmakeBool "RE2_USE_ICU" true)
] ++ lib.optional (!stdenv.hostPlatform.isStatic) (lib.cmakeBool "BUILD_SHARED_LIBS" true);
cmakeFlags =
[ (lib.cmakeBool "RE2_BUILD_TESTING" true) ]
++ lib.optionals (!stdenv.hostPlatform.isStatic) [
(lib.cmakeBool "RE2_USE_ICU" true)
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
];
doCheck = true;