From 59edab3a476de70a6325e0194aaef23e0f25cc5a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 19 Dec 2019 04:20:00 -0500 Subject: jsoncpp: fix build on aarch64 --- pkgs/development/libraries/jsoncpp/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/jsoncpp') diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index a6eae7a79fa..72158e186ac 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv , fetchFromGitHub , cmake , python }: +{ stdenv, fetchFromGitHub, cmake, python, fetchpatch }: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -30,6 +30,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; + # fix inverted sense in isAnyCharRequiredQuoting on aarch64. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 + patches = stdenv.lib.optionals stdenv.isAarch64 [ + (fetchpatch { + url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; + sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; + }) + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" -- cgit 1.4.1