diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2020-07-05 00:18:12 -0400 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2020-07-06 12:54:41 -0400 |
| commit | 5b37e8cf1a96fb37ed0b3bd9899c93247d693a91 (patch) | |
| tree | 08d5c61d74a57db0e5ac8a92d95f71c2f6223898 /pkgs/development/libraries/jsoncpp | |
| parent | 22a81aa5fc15b2d41b12f7160a71cd4a9f3c3fa1 (diff) | |
jsoncpp: fix generated pkg-config file
Diffstat (limited to 'pkgs/development/libraries/jsoncpp')
| -rw-r--r-- | pkgs/development/libraries/jsoncpp/default.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 155103af3c4e..8635c1fb40d2 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, python, fetchpatch }: +{ stdenv, fetchFromGitHub, cmake, python, validatePkgConfig, fetchpatch }: stdenv.mkDerivation rec { pname = "jsoncpp"; @@ -28,10 +28,16 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python validatePkgConfig ]; - # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 - patches = stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + patches = [ + # Fix generation of pkg-config file (https://github.com/open-source-parsers/jsoncpp/pull/1199) + (fetchpatch { + url = "https://github.com/open-source-parsers/jsoncpp/commit/b05a21342a646a986b11c28ba6b19665756d21d2.patch"; + sha256 = "0dn4cvvkcp9mnxbzyaqb49z6bv5yqsx1wlf1lyki1n2rni2hn63p"; + }) + ] ++ stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ + # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 (fetchpatch { url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; |