From c52294359c012f330ee7e9a2e2cacf8ef9c6ffc8 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Tue, 9 Aug 2022 18:16:17 +0200 Subject: [PATCH 1/2] pkgsStatic.rapidjson: fix build The library itself compiles fine, but the tests don't. --- pkgs/development/libraries/rapidjson/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 49cbc7ab764c..de18e3fedd69 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "-DRAPIDJSON_BUILD_TESTS=OFF" ]; checkInputs = [ From 9f980dee7f3a386fd5df9348a9330b1e6999da9f Mon Sep 17 00:00:00 2001 From: tobim Date: Wed, 10 Aug 2022 00:34:22 +0200 Subject: [PATCH 2/2] pkgsStatic.rapidjson: disable checks --- pkgs/development/libraries/rapidjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index de18e3fedd69..ac2d7e0b5f55 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + ] ++ lib.optionals (!doCheck) [ "-DRAPIDJSON_BUILD_TESTS=OFF" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - doCheck = true; + doCheck = !stdenv.hostPlatform.isStatic; meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";