diff options
author | Carles Pagès <page@ruiec.cat> | 2017-02-03 12:51:59 +0100 |
---|---|---|
committer | Carles Pagès <page@ruiec.cat> | 2017-02-03 13:21:56 +0100 |
commit | 0cde365745fc9dfbffeb414ec9fb70c272f8f418 (patch) | |
tree | 0a820c0ba3da551abe772fd31e7bf28982be1434 /pkgs/development/libraries/jsoncpp | |
parent | 47127e6951938749e46932069ed316007dc748c4 (diff) | |
download | nixpkgs-0cde365745fc9dfbffeb414ec9fb70c272f8f418.tar nixpkgs-0cde365745fc9dfbffeb414ec9fb70c272f8f418.tar.gz nixpkgs-0cde365745fc9dfbffeb414ec9fb70c272f8f418.tar.bz2 nixpkgs-0cde365745fc9dfbffeb414ec9fb70c272f8f418.tar.lz nixpkgs-0cde365745fc9dfbffeb414ec9fb70c272f8f418.tar.xz nixpkgs-0cde365745fc9dfbffeb414ec9fb70c272f8f418.tar.zst nixpkgs-0cde365745fc9dfbffeb414ec9fb70c272f8f418.zip |
jsoncpp: 1.7.2->1.8.0
I also re-added some stuff lost in previous update (83fd63995af), like darwin support and maintainers info.
Diffstat (limited to 'pkgs/development/libraries/jsoncpp')
-rw-r--r-- | pkgs/development/libraries/jsoncpp/default.nix | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 5c4c4a693df..62e5e7133b4 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -1,34 +1,47 @@ { stdenv -, fetchgit +, fetchFromGitHub , cmake , python }: stdenv.mkDerivation rec { name = "jsoncpp-${version}"; - version = "1.7.2"; + version = "1.8.0"; - src = fetchgit { - url = https://github.com/open-source-parsers/jsoncpp.git; - sha256 = "04w4cfmvyv52rpqhc370ln8rhlsrr515778bixhgafqbp3p4x34k"; - rev = "c8054483f82afc3b4db7efe4e5dc034721649ec8"; + src = fetchFromGitHub { + owner = "open-source-parsers"; + repo = "jsoncpp"; + rev = version; + sha256 = "1lg22zrjnl10x1bw0wfz72xd2kfbzynyggk8vdwd89mp1g8xjl9d"; }; - configurePhase = '' - mkdir -p Build - pushd Build + /* During darwin bootstrap, we have a cp that doesn't understand the + * --reflink=auto flag, which is used in the default unpackPhase for dirs + */ + unpackPhase = '' + cp -a ${src} ${src.name} + chmod -R +w ${src.name} + export sourceRoot=${src.name} + ''; - mkdir -p $out - cmake .. -DCMAKE_INSTALL_PREFIX=$out \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=Release - ''; + # Hack to be able to run the test, broken because we use + # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install + preBuild = '' + export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH" + ''; - buildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_STATIC_LIBS=OFF" + ]; meta = with stdenv.lib; { + inherit version; homepage = https://github.com/open-source-parsers/jsoncpp; description = "A C++ library for interacting with JSON."; + maintainers = with maintainers; [ ttuegel page ]; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; }; } |