fix: apply rocksdb changes in checks and shll

This commit is contained in:
aviac
2025-10-16 08:27:58 +02:00
committed by Jade Ellis
parent 68bea1816f
commit c1c165ab48
2 changed files with 14 additions and 5 deletions
+9 -4
View File
@@ -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;
+5 -1
View File
@@ -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 ];
};