mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
Merge pull request #186559 from NickCao/rapidjson
rapidjson: fix cross compilation, cleanup checkPhase
This commit is contained in:
commit
0a216732d8
1 changed files with 6 additions and 17 deletions
|
@ -5,6 +5,7 @@
|
|||
, pkg-config
|
||||
, cmake
|
||||
, gtest
|
||||
, valgrind
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -36,24 +37,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGTEST_SOURCE_DIR=${gtest.dev}/include"
|
||||
] ++ lib.optionals (!doCheck) [
|
||||
"-DRAPIDJSON_BUILD_TESTS=OFF"
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
gtest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
ctest -E '.*valgrind.*'
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
# for tests, adding gtest to checkInputs does not work
|
||||
# https://github.com/NixOS/nixpkgs/pull/212200
|
||||
buildInputs = [ gtest ];
|
||||
cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ];
|
||||
|
||||
nativeCheckInputs = [ valgrind ];
|
||||
doCheck = !stdenv.hostPlatform.isStatic;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
Loading…
Reference in a new issue