cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #186559 from NickCao/rapidjson

Browse source 
rapidjson: fix cross compilation, cleanup checkPhase
This commit is contained in:
Nick Cao 2023-01-27 08:24:32 +08:00 committed by GitHub
commit 0a216732d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/development/libraries/rapidjson/default.nix
View file

@ -5,6 +5,7 @@
, pkg-config , pkg-config
, cmake , cmake
, gtest , gtest
, valgrind
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -36,24 +37,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];
cmakeFlags = [ # for tests, adding gtest to checkInputs does not work
"-DGTEST_SOURCE_DIR=${gtest.dev}/include" # https://github.com/NixOS/nixpkgs/pull/212200
] ++ lib.optionals (!doCheck) [ buildInputs = [ gtest ];
"-DRAPIDJSON_BUILD_TESTS=OFF" cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ];
];
nativeCheckInputs = [
gtest
];
checkPhase = ''
runHook preCheck
ctest -E '.*valgrind.*'
runHook postCheck
'';
nativeCheckInputs = [ valgrind ];
doCheck = !stdenv.hostPlatform.isStatic; doCheck = !stdenv.hostPlatform.isStatic;
meta = with lib; { meta = with lib; {