Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e76d0c37e6df
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9430fd949eda
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 2, 2020

  1. jsoncpp: 1.9.2 -> 1.9.4 

    Merges both patches previously applied. Also seems to change the path that the library is written to.
    CrystalGamma committed Nov 2, 2020
    Copy the full SHA
    f352109 View commit details

Commits on Nov 7, 2020

  1. Merge pull request #102379 from CrystalGamma/pr-jsoncpp-update 

    jsoncpp: 1.9.2 -> 1.9.4
    @cpages
    cpages authored Nov 7, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9430fd9 View commit details
Showing with 7 additions and 18 deletions.
  1. +7 −18 pkgs/development/libraries/jsoncpp/default.nix
25 changes: 7 additions & 18 deletions pkgs/development/libraries/jsoncpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
];