diff options
| author | Nick Cao <nickcao@nichi.co> | 2022-08-14 10:39:51 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2023-01-23 10:59:30 +0800 |
| commit | 3c9db360007ac503a76fb640098e8607a0cca198 (patch) | |
| tree | 1d8190075bc9dd290875d3c6d5f151f5c8e260fa | |
| parent | a5eb4b4c68319302f33585041926930abb6cd79b (diff) | |
| download | nixpkgs-3c9db360007ac503a76fb640098e8607a0cca198.tar nixpkgs-3c9db360007ac503a76fb640098e8607a0cca198.tar.gz nixpkgs-3c9db360007ac503a76fb640098e8607a0cca198.tar.bz2 nixpkgs-3c9db360007ac503a76fb640098e8607a0cca198.tar.lz nixpkgs-3c9db360007ac503a76fb640098e8607a0cca198.tar.xz nixpkgs-3c9db360007ac503a76fb640098e8607a0cca198.tar.zst nixpkgs-3c9db360007ac503a76fb640098e8607a0cca198.zip | |
rapidjson: fix cross compilation, cleanup checkPhase
| -rw-r--r-- | pkgs/development/libraries/rapidjson/default.nix | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 989a88f111e..9d8db78e021 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -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; { |