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

Merge pull request #22404 from cpages/jsoncpp

Browse Source 
jsoncpp: update and drop old version
This commit is contained in:
Thomas Tuegel 2017-02-04 20:06:53 -06:00 committed by GitHub
commit f9c684e152
3 changed files with 31 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pkgs/development/libraries/jsoncpp/1.6.5/default.nix
View File

@ -1,48 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, python }:
stdenv.mkDerivation rec {
name = "jsoncpp-${version}";
version = "1.6.5";
src = fetchFromGitHub {
owner = "open-source-parsers";
repo = "jsoncpp";
rev = version;
sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0";
};
/* 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}
'';
# 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"
'';
nativeBuildInputs = [ cmake python ];
CXXFLAGS = "-Wno-shift-negative-value";
cmakeFlags = [
"-DJSONCPP_LIB_BUILD_SHARED=ON"
"-DJSONCPP_LIB_BUILD_STATIC=OFF"
"-DJSONCPP_WITH_CMAKE_PACKAGE=ON"
];
meta = {
inherit version;
homepage = https://github.com/open-source-parsers/jsoncpp;
description = "A simple API to manipulate JSON data in C++";
maintainers = with stdenv.lib.maintainers; [ ttuegel cpages ];
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.mit;
branch = "1.6";
};
}

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

@ -1,34 +1,49 @@
{ 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 = if stdenv.isDarwin then ''
export DYLD_LIBRARY_PATH="`pwd`/src/lib_json:$DYLD_LIBRARY_PATH"
'' else ''
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 cpages ];
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.all;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -7752,8 +7752,6 @@ with pkgs;
jsoncpp = callPackage ../development/libraries/jsoncpp { };
jsoncpp_1_6_5 = callPackage ../development/libraries/jsoncpp/1.6.5 { };
jsonnet = callPackage ../development/compilers/jsonnet { };
libjson = callPackage ../development/libraries/libjson { };