From c1c165ab4815eab1ff67da84c7b3f6aa05c21768 Mon Sep 17 00:00:00 2001 From: aviac Date: Thu, 16 Oct 2025 08:27:58 +0200 Subject: [PATCH] fix: apply rocksdb changes in checks and shll --- nix/checks/default.nix | 13 +++++++++---- nix/shells/default.nix | 6 +++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/nix/checks/default.nix b/nix/checks/default.nix index 04678942..aaa9d82f 100644 --- a/nix/checks/default.nix +++ b/nix/checks/default.nix @@ -10,11 +10,16 @@ let uwulib = inputs.self.uwulib.init pkgs; + rocksdbAllFeatures = self'.packages.rocksdb.override { + enableJemalloc = true; + enableLiburing = true; + }; + commonAttrs = (uwulib.build.commonAttrs { }) // { buildInputs = [ pkgs.liburing self'.packages.rust-jemalloc-sys-unprefixed' - self'.packages.rocksdbAllFeatures + rocksdbAllFeatures ]; nativeBuildInputs = [ pkgs.pkg-config @@ -28,13 +33,13 @@ LD_LIBRARY_PATH = lib.makeLibraryPath [ pkgs.liburing self'.packages.rust-jemalloc-sys-unprefixed' - self'.packages.rocksdbAllFeatures + rocksdbAllFeatures ]; } // uwulib.environment.buildPackageEnv // { - ROCKSDB_INCLUDE_DIR = "${self'.packages.rocksdbAllFeatures}/include"; - ROCKSDB_LIB_DIR = "${self'.packages.rocksdbAllFeatures}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdbAllFeatures}/include"; + ROCKSDB_LIB_DIR = "${rocksdbAllFeatures}/lib"; }; }; cargoArtifacts = self'.packages.continuwuity-all-features-deps; diff --git a/nix/shells/default.nix b/nix/shells/default.nix index 1524441d..bf5b5da8 100644 --- a/nix/shells/default.nix +++ b/nix/shells/default.nix @@ -9,6 +9,10 @@ }: let uwulib = inputs.self.uwulib.init pkgs; + rocksdbAllFeatures = self'.packages.rocksdb.override { + enableJemalloc = true; + enableLiburing = true; + }; in { # basic nix shell containing all things necessary to build continuwuity in all flavors manually (on x86_64-linux) @@ -17,7 +21,7 @@ pkgs.pkg-config pkgs.liburing self'.packages.rust-jemalloc-sys-unprefixed' - self'.packages.rocksdbAllFeatures + rocksdbAllFeatures ]; env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ]; };