From 92775fc62fe541d780d89877345e4cb07637132c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 11 Jun 2022 04:47:13 +0000 Subject: [PATCH] rapidjson: run tests --- .../libraries/rapidjson/default.nix | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 1211892890a..49cbc7ab764 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, cmake +, gtest +}: stdenv.mkDerivation rec { pname = "rapidjson"; @@ -16,20 +23,42 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/rapidjson/raw/48402da9f19d060ffcd40bf2b2e6987212c58b0c/f/rapidjson-1.1.0-c++20.patch"; sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82"; }) + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch"; + hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; + }) ]; + postPatch = '' + find -name CMakeLists.txt | xargs \ + sed -i -e "s/-Werror//g" -e "s/-march=native//g" + ''; + nativeBuildInputs = [ pkg-config cmake ]; - preConfigure = '' - substituteInPlace CMakeLists.txt --replace "-Werror" "" - substituteInPlace example/CMakeLists.txt --replace "-Werror" "" + cmakeFlags = [ + "-DGTEST_SOURCE_DIR=${gtest.dev}/include" + ]; + + checkInputs = [ + gtest + ]; + + checkPhase = '' + runHook preCheck + + ctest -E '.*valgrind.*' + + runHook postCheck ''; + doCheck = true; + meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; homepage = "http://rapidjson.org/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan dotlambda ]; }; }