Merge pull request #3907 from hzeller/20231014-use-json

Development under nix: Don't rely on third_party/, use local nlohmann…
chipsalliance · Oct 15, 2023 · 140d669 · 140d669
2 parents b9f6db9 + bd86420
commit 140d669
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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}"
   '';
 }