nlohmann_json: Update to 3.9.1, fix use of internal copy

klemensn · Jul 15, 2021 · 3079779 · 3079779
1 parent 77d5b37
commit 3079779
Show file tree

Hide file tree

Showing 4 changed files with 15,497 additions and 10,380 deletions.
diff --git a/Makefile b/Makefile
@@ -33,4 +33,4 @@ endif
 
 include mk/lib.mk
 
-GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17
+GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17 -I src
diff --git a/flake.nix b/flake.nix
@@ -89,7 +89,6 @@
             openssl sqlite
             libarchive
             boost
-            nlohmann_json
             lowdown
             gmock
           ]
@@ -334,7 +333,6 @@
                 xz
                 pkgs.perl
                 boost
-                nlohmann_json
               ]
               ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
               ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,4 @@ endif

		include mk/lib.mk

		GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17
		GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++17 -I src