nlohmann_json: 3.6.1 -> 3.7.0
Also install multiple headers (in particular to get json_fwd.hpp, which Nix needs).
This commit is contained in:
parent
ed145e8f22
commit
e89e0385c1
|
@ -3,13 +3,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nlohmann_json";
|
pname = "nlohmann_json";
|
||||||
version = "3.6.1";
|
version = "3.7.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "nlohmann";
|
owner = "nlohmann";
|
||||||
repo = "json";
|
repo = "json";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1dgx3j9pb0f52dh73z8dpwdy79bra1qi5vpl66b9inq4gamf813z";
|
sha256 = "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
@ -18,10 +18,13 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DBuildTests=${if doCheck then "ON" else "OFF"}"
|
"-DBuildTests=${if doCheck then "ON" else "OFF"}"
|
||||||
|
"-DJSON_MultipleHeaders=ON"
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||||
|
|
||||||
|
postInstall = "rm -rf $out/lib64";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Header only C++ library for the JSON file format";
|
description = "Header only C++ library for the JSON file format";
|
||||||
homepage = https://github.com/nlohmann/json;
|
homepage = https://github.com/nlohmann/json;
|
||||||
|
|
Loading…
Reference in New Issue