From cdd67f4779765c91cade7e3cdb785dfcf0b9ff71 Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Sun, 14 Apr 2024 10:57:07 +0200
Subject: [PATCH] fix flake and pull in os zstd fixes

---
 external/solanaceae_object_store | 2 +-
 external/solanaceae_util         | 2 +-
 flake.nix                        | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/external/solanaceae_object_store b/external/solanaceae_object_store
index 4d3ffb8..4695579 160000
--- a/external/solanaceae_object_store
+++ b/external/solanaceae_object_store
@@ -1 +1 @@
-Subproject commit 4d3ffb8192623740f6e170855ee1cffd428b78da
+Subproject commit 46955795b034ed4b058958bba620bd8965ce91f7
diff --git a/external/solanaceae_util b/external/solanaceae_util
index bee42d4..2420af4 160000
--- a/external/solanaceae_util
+++ b/external/solanaceae_util
@@ -1 +1 @@
-Subproject commit bee42d4688e873115d578032970f0d5b84c41605
+Subproject commit 2420af464f270afaf07391ab51cc94a8b979e00c
diff --git a/flake.nix b/flake.nix
index f957dd0..aa320e1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,6 +58,9 @@
         cmakeFlags = [
           "-DTOMATO_ASAN=OFF"
           "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+          "-DFETCHCONTENT_SOURCE_DIR_JSON=${pkgs.nlohmann_json.src}" # we care less about version here
+          # do we really care less about the version? do we need a stable abi?
+          "-DFETCHCONTENT_SOURCE_DIR_ZSTD=${pkgs.zstd.src}" # TODO: use package instead
         ];
 
         # TODO: replace with install command