cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

jsoncpp: 1.9.2 -> 1.9.4

Browse source 
Merges both patches previously applied. Also seems to change the path that the library is written to.
This commit is contained in:
CrystalGamma 2020-10-20 11:15:03 +02:00
parent eaf06c30ac
commit f352109086
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/development/libraries/jsoncpp/default.nix
View file

@ -2,13 +2,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jsoncpp"; pname = "jsoncpp";
version = "1.9.2"; version = "1.9.4";
outputs = ["out" "dev"];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-source-parsers"; owner = "open-source-parsers";
repo = "jsoncpp"; repo = "jsoncpp";
rev = version; rev = version;
sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv";
}; };
/* During darwin bootstrap, we have a cp that doesn't understand the /* During darwin bootstrap, we have a cp that doesn't understand the
@ -23,30 +25,17 @@ stdenv.mkDerivation rec {
# Hack to be able to run the test, broken because we use # Hack to be able to run the test, broken because we use
# CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install
preBuild = if stdenv.isDarwin then '' preBuild = if stdenv.isDarwin then ''
export DYLD_LIBRARY_PATH="`pwd`/src/lib_json''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH"
'' else '' '' else ''
export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
''; '';
nativeBuildInputs = [ cmake python validatePkgConfig ]; nativeBuildInputs = [ cmake python validatePkgConfig ];
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";
})
];
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DBUILD_STATIC_LIBS=OFF" "-DBUILD_STATIC_LIBS=OFF"
"-DBUILD_OBJECT_LIBS=OFF"
"-DJSONCPP_WITH_CMAKE_PACKAGE=ON" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
]; ];