pyrox.dev
Merge pull request #186559 from NickCao/rapidjson
rapidjson: fix cross compilation, cleanup checkPhase
+6
-17
pkgs/development/libraries/rapidjson/default.nix
+6
-17
pkgs/development/libraries/rapidjson/default.nix
···
5
5
, pkg-config
6
6
, cmake
7
7
, gtest
8
+
, valgrind
8
9
}:
9
10
10
11
stdenv.mkDerivation rec {
···
36
37
37
38
nativeBuildInputs = [ pkg-config cmake ];
38
39
39
-
cmakeFlags = [
40
-
"-DGTEST_SOURCE_DIR=${gtest.dev}/include"
41
-
] ++ lib.optionals (!doCheck) [
42
-
"-DRAPIDJSON_BUILD_TESTS=OFF"
43
-
];
44
-
45
-
nativeCheckInputs = [
46
-
gtest
47
-
];
48
-
49
-
checkPhase = ''
50
-
runHook preCheck
40
+
# for tests, adding gtest to checkInputs does not work
41
+
# https://github.com/NixOS/nixpkgs/pull/212200
42
+
buildInputs = [ gtest ];
43
+
cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ];
51
44
52
-
ctest -E '.*valgrind.*'
53
-
54
-
runHook postCheck
55
-
'';
56
-
45
+
nativeCheckInputs = [ valgrind ];
57
46
doCheck = !stdenv.hostPlatform.isStatic;
58
47
59
48
meta = with lib; {