From 5bb810396256503168a161b49626e6c289111726 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 7 Nov 2024 14:43:23 +0100
Subject: [PATCH] hacks?

---
 modules/default.nix   |  4 ++--
 pkgs/tvix/default.nix | 35 ++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/modules/default.nix b/modules/default.nix
index 4d030f8..9bfbb4c 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -110,9 +110,9 @@ in
                   cacheAttrs.config.common-composition
                   {
                     pathinfoservices.default = {
-                      type = "sled";
+                      type = "redb";
                       is_temporary = false;
-                      path = "/var/lib/tvix-daemon-${name}/pathinfos.sled";
+                      path = "/var/lib/tvix-daemon-${name}/pathinfos.redb";
                     };
                   }
                 ];
diff --git a/pkgs/tvix/default.nix b/pkgs/tvix/default.nix
index 20c2ad8..1d5a235 100644
--- a/pkgs/tvix/default.nix
+++ b/pkgs/tvix/default.nix
@@ -1,21 +1,21 @@
 {
+  lib,
   fetchgit,
   fetchpatch,
   rustPlatform,
   protobuf,
   packages ? [ ],
   pname ? "tvix",
-}:
-
-rustPlatform.buildRustPackage rec {
-  inherit pname;
-  version = "0.1.0";
-
-  src = builtins.fetchGit {
+  src ? builtins.fetchGit {
     name = "tvix";
     url = "https://code.tvl.fyi/depot.git";
     rev = "96a78877eb0d3109bd5b76345b9f1aa87bb3ec20";
-  };
+  },
+}:
+
+rustPlatform.buildRustPackage {
+  inherit pname src;
+  version = "0.1.0";
 
   patches = [
     (fetchpatch {
@@ -32,13 +32,18 @@ rustPlatform.buildRustPackage rec {
 
   doCheck = false;
 
-  cargoBuildFlags = builtins.concatStringsSep " " (
-    builtins.map (v: "-p ${v}") packages
-    ++ [
-      "--features"
-      "tvix-store/xp-store-composition"
-    ]
-  );
+  #buildNoDefaultFeatures = true;
+
+  buildFeatures = [
+    "tvix-store/xp-store-composition"
+    #"tvix-store/fs"
+    #"tvix-store/fuse"
+    #"tvix-store/tonic-reflection"
+    #"nix-compat/async"
+    #"nix-compat/wire"
+  ];
+
+  cargoBuildFlags = builtins.map (v: "-p ${v}") packages;
 
   nativeBuildInputs = [ protobuf ];