summary refs log tree commit diff
path: root/pkgs/development/libraries/nlohmann_json/default.nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-10-22 19:12:57 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-10-23 00:24:25 +0200
commite89e0385c10a0325401c9ffeb3a7c8ebefdffb93 (patch)
tree4909334ba771da925e3c2827ae96eb98eb22b10b /pkgs/development/libraries/nlohmann_json/default.nix
parented145e8f2205572b4ff84e5a04eca6e18780cfee (diff)
downloadnixpkgs-e89e0385c10a0325401c9ffeb3a7c8ebefdffb93.tar
nixpkgs-e89e0385c10a0325401c9ffeb3a7c8ebefdffb93.tar.gz
nixpkgs-e89e0385c10a0325401c9ffeb3a7c8ebefdffb93.tar.bz2
nixpkgs-e89e0385c10a0325401c9ffeb3a7c8ebefdffb93.tar.lz
nixpkgs-e89e0385c10a0325401c9ffeb3a7c8ebefdffb93.tar.xz
nixpkgs-e89e0385c10a0325401c9ffeb3a7c8ebefdffb93.tar.zst
nixpkgs-e89e0385c10a0325401c9ffeb3a7c8ebefdffb93.zip
nlohmann_json: 3.6.1 -> 3.7.0
Also install multiple headers (in particular to get json_fwd.hpp,
which Nix needs).
Diffstat (limited to 'pkgs/development/libraries/nlohmann_json/default.nix')
-rw-r--r--pkgs/development/libraries/nlohmann_json/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix
index 129cc7ed84c..3a51c2ec72b 100644
--- a/pkgs/development/libraries/nlohmann_json/default.nix
+++ b/pkgs/development/libraries/nlohmann_json/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nlohmann_json";
-  version = "3.6.1";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "nlohmann";
     repo = "json";
     rev = "v${version}";
-    sha256 = "1dgx3j9pb0f52dh73z8dpwdy79bra1qi5vpl66b9inq4gamf813z";
+    sha256 = "0v7xih4zjixxxfvkfbs7a8j9qcvpwlsv4vrkbyns3hc7b44nb8ap";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -18,10 +18,13 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBuildTests=${if doCheck then "ON" else "OFF"}"
+    "-DJSON_MultipleHeaders=ON"
   ];
 
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
 
+  postInstall = "rm -rf $out/lib64";
+
   meta = with stdenv.lib; {
     description = "Header only C++ library for the JSON file format";
     homepage = https://github.com/nlohmann/json;