From bd86420e839a14751d5513581fb38de0ac6782a8 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 14 Oct 2023 23:29:44 -0700 Subject: [PATCH] Development under nix: Don't rely on third_party/, use local nlohmann_json --- shell.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell.nix b/shell.nix index d4e92582bf..ffa3ea552d 100644 --- a/shell.nix +++ b/shell.nix @@ -28,6 +28,7 @@ pkgs.mkShell { antlr4.runtime.cpp capnproto gtest + nlohmann_json # Ease development ccache @@ -39,6 +40,6 @@ pkgs.mkShell { ]; shellHook = '' export CMAKE_CXX_COMPILER_LAUNCHER=ccache - export ADDITIONAL_CMAKE_OPTIONS="-DSURELOG_USE_HOST_GTEST=On -DSURELOG_USE_HOST_CAPNP=On -DSURELOG_USE_HOST_ANTLR=On -DANTLR_JAR_LOCATION=${pkgs.antlr4.jarLocation}" + export ADDITIONAL_CMAKE_OPTIONS="-DSURELOG_USE_HOST_GTEST=On -DSURELOG_USE_HOST_CAPNP=On -DSURELOG_USE_HOST_JSON=On -DSURELOG_USE_HOST_ANTLR=On -DANTLR_JAR_LOCATION=${pkgs.antlr4.jarLocation}" ''; }