mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 16:42:09 +00:00
jsoncpp: 1.6.0 -> 1.6.2
This commit is contained in:
parent
e2b6e11b94
commit
3550d117cc
|
@ -1,24 +1,27 @@
|
||||||
{ stdenv, fetchurl, cmake, python }:
|
{ stdenv, fetchFromGitHub, cmake, python }:
|
||||||
|
|
||||||
let
|
|
||||||
basename = "jsoncpp";
|
|
||||||
version = "1.6.0";
|
|
||||||
in
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "${basename}-${version}";
|
name = "jsoncpp-${version}";
|
||||||
src = fetchurl {
|
version = "1.6.2";
|
||||||
url = "https://github.com/open-source-parsers/${basename}/archive/${version}.tar.gz";
|
|
||||||
sha256 = "0ff1niks3y41gr6z13q9m391na70abqyi9rj4z3y2fz69cwm6sgz";
|
src = fetchFromGitHub {
|
||||||
|
owner = "open-source-parsers";
|
||||||
|
repo = "jsoncpp";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "0p92i0hx2k3g8mwrcy339b56bfq8qgpb65id8xllkgd2ns4wi9zi";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs = [
|
||||||
[
|
# cmake can be built with the system jsoncpp, or its own bundled version.
|
||||||
# cmake can be built with the system jsoncpp, or its own bundled version.
|
# Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
|
||||||
# Obviously we cannot build it against the system jsoncpp that doesn't yet exist, so
|
# we make a bootstrapping build with the bundled version.
|
||||||
# we make a bootstrapping build with the bundled version.
|
(cmake.override { jsoncpp = null; })
|
||||||
(cmake.override { jsoncpp = null; })
|
python
|
||||||
python
|
];
|
||||||
];
|
|
||||||
|
cmakeFlags = [
|
||||||
|
"-DJSONCPP_WITH_CMAKE_PACKAGE=1"
|
||||||
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
Loading…
Reference in a new issue