From cb138f50395c02a6bc8d8fab2b82cc86212b103d Mon Sep 17 00:00:00 2001 From: Shuroii Date: Thu, 3 Jul 2025 13:11:16 +0200 Subject: [PATCH] ref: Clean up rocksdb build --- flake.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index f7635d02..89ab8e16 100644 --- a/flake.nix +++ b/flake.nix @@ -42,9 +42,8 @@ mkScope = pkgs: pkgs.lib.makeScope pkgs.newScope (self: { - inherit pkgs; + inherit pkgs inputs; craneLib = ((inputs.crane.mkLib pkgs).overrideToolchain (_: toolchain)); - inherit inputs; main = self.callPackage ./nix/pkgs/main { }; liburing = pkgs.liburing.overrideAttrs { # Tests weren't building @@ -56,14 +55,17 @@ buildFlags = [ "library" ]; }; rocksdb = - (pkgs.rocksdb.override { + (pkgs.rocksdb_9_10.override { + # Override the liburing input for the build with our own so + # we have it built with the library flag + liburing = self.liburing; }).overrideAttrs (old: { src = inputs.rocksdb; version = "v9.11.1"; cmakeFlags = pkgs.lib.subtractLists [ - # no real reason to have snappy or zlib, no one uses this + # No real reason to have snappy or zlib, no one uses this "-DWITH_SNAPPY=1" "-DZLIB=1" "-DWITH_ZLIB=1"