Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply rocksdb changes in checks and shll

Browse Source
This commit is contained in:
aviac
2025-10-27 12:55:20 +00:00
committed by Jade Ellis
parent 68bea1816f
commit c1c165ab48
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/checks/default.nix
+9 -4
View File
@@ -10,11 +10,16 @@
let let
uwulib = inputs.self.uwulib.init pkgs; uwulib = inputs.self.uwulib.init pkgs;
rocksdbAllFeatures = self'.packages.rocksdb.override {
enableJemalloc = true;
enableLiburing = true;
};
commonAttrs = (uwulib.build.commonAttrs { }) // { commonAttrs = (uwulib.build.commonAttrs { }) // {
buildInputs = [ buildInputs = [
pkgs.liburing pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed' self'.packages.rust-jemalloc-sys-unprefixed'
self'.packages.rocksdbAllFeatures rocksdbAllFeatures
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.pkg-config pkgs.pkg-config
@@ -28,13 +33,13 @@
LD_LIBRARY_PATH = lib.makeLibraryPath [ LD_LIBRARY_PATH = lib.makeLibraryPath [
pkgs.liburing pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed' self'.packages.rust-jemalloc-sys-unprefixed'
self'.packages.rocksdbAllFeatures rocksdbAllFeatures
]; ];
} }
// uwulib.environment.buildPackageEnv // uwulib.environment.buildPackageEnv
// { // {
ROCKSDB_INCLUDE_DIR = "${self'.packages.rocksdbAllFeatures}/include"; ROCKSDB_INCLUDE_DIR = "${rocksdbAllFeatures}/include";
ROCKSDB_LIB_DIR = "${self'.packages.rocksdbAllFeatures}/lib"; ROCKSDB_LIB_DIR = "${rocksdbAllFeatures}/lib";
}; };
}; };
cargoArtifacts = self'.packages.continuwuity-all-features-deps; cargoArtifacts = self'.packages.continuwuity-all-features-deps;
nix/shells/default.nix
+5 -1
View File
@@ -9,6 +9,10 @@
}: }:
let let
uwulib = inputs.self.uwulib.init pkgs; uwulib = inputs.self.uwulib.init pkgs;
rocksdbAllFeatures = self'.packages.rocksdb.override {
enableJemalloc = true;
enableLiburing = true;
};
in in
{ {
# basic nix shell containing all things necessary to build continuwuity in all flavors manually (on x86_64-linux) # 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.pkg-config
pkgs.liburing pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed' self'.packages.rust-jemalloc-sys-unprefixed'
self'.packages.rocksdbAllFeatures rocksdbAllFeatures
]; ];
env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ]; env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];
}; };