JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #92307 from lopsided98/jsoncpp-cmake

Browse Source 
jsoncpp: fix generated pkg-config file
This commit is contained in:
Jan Tojnar 2020-07-09 00:15:42 +02:00 committed by GitHub
commit 9b763e2e09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/jsoncpp/default.nix
View File

@ -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";