diff options
author | CrystalGamma <user@talos-nixos.local> | 2020-10-20 11:15:03 +0200 |
---|---|---|
committer | CrystalGamma <user@talos-nixos.local> | 2020-11-02 16:02:51 +0100 |
commit | f352109086994421bbd4bc09e9c0481d20fda70e (patch) | |
tree | 1f884fb201c8fefbb745a5b111dac3d96995d3ab /pkgs/development/libraries/jsoncpp | |
parent | eaf06c30ace7e0221e18edd30b6dbda0e4a16162 (diff) | |
download | nixpkgs-f352109086994421bbd4bc09e9c0481d20fda70e.tar nixpkgs-f352109086994421bbd4bc09e9c0481d20fda70e.tar.gz nixpkgs-f352109086994421bbd4bc09e9c0481d20fda70e.tar.bz2 nixpkgs-f352109086994421bbd4bc09e9c0481d20fda70e.tar.lz nixpkgs-f352109086994421bbd4bc09e9c0481d20fda70e.tar.xz nixpkgs-f352109086994421bbd4bc09e9c0481d20fda70e.tar.zst nixpkgs-f352109086994421bbd4bc09e9c0481d20fda70e.zip |
jsoncpp: 1.9.2 -> 1.9.4
Merges both patches previously applied. Also seems to change the path that the library is written to.
Diffstat (limited to 'pkgs/development/libraries/jsoncpp')
-rw-r--r-- | pkgs/development/libraries/jsoncpp/default.nix | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 5e361a09d35..73aaaec4e4c 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "jsoncpp"; - version = "1.9.2"; + version = "1.9.4"; + + outputs = ["out" "dev"]; src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; rev = version; - sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; + sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; /* 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 # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install 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 '' - 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 ]; - 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 = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" + "-DBUILD_OBJECT_LIBS=OFF" "-DJSONCPP_WITH_CMAKE_PACKAGE=ON" ]; |