chore: use upstream rust-jemalloc-sys-unprefixed after flake.lock update

This commit is contained in:
aviac
2025-10-22 11:08:01 +02:00
committed by Jade Ellis
parent 9a887ac04b
commit ec3564e8aa
6 changed files with 30 additions and 60 deletions
+2 -2
View File
@@ -18,7 +18,7 @@
commonAttrs = (uwulib.build.commonAttrs { }) // {
buildInputs = [
pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed'
pkgs.rust-jemalloc-sys-unprefixed
rocksdbAllFeatures
];
nativeBuildInputs = [
@@ -32,7 +32,7 @@
LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];
LD_LIBRARY_PATH = lib.makeLibraryPath [
pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed'
pkgs.rust-jemalloc-sys-unprefixed
rocksdbAllFeatures
];
}
-1
View File
@@ -1,7 +1,6 @@
{
imports = [
./continuwuity
./jemalloc.nix
./rocksdb
./rust.nix
./uwulib
-26
View File
@@ -1,26 +0,0 @@
{
perSystem =
{
pkgs,
...
}:
{
# we disable some unused features here. The code won't compile without these
#
# > <jemalloc>: Invalid conf pair: prof_active:false
# > error: test failed, to rerun pass `-p conduwuit --lib`
# >
# > Caused by:
# > process didn't exit successfully: `/build/source/target/release/deps/conduwuit-67fbd204f38e8c35` (signal: 11, SIGSEGV: invalid memory reference)
packages.rust-jemalloc-sys-unprefixed' = pkgs.rust-jemalloc-sys-unprefixed.overrideAttrs (old: {
configureFlags =
old.configureFlags
++
# we dont need docs
[ "--disable-doc" ]
++
# we dont need cxx/C++ integration
[ "--disable-cxx" ];
});
};
}
+1 -4
View File
@@ -1,15 +1,12 @@
{
perSystem =
{
self',
pkgs,
...
}:
{
packages = {
rocksdb = pkgs.callPackage ./package.nix {
rust-jemalloc-sys-unprefixed = self'.packages.rust-jemalloc-sys-unprefixed';
};
rocksdb = pkgs.callPackage ./package.nix { };
};
};
}
+1 -1
View File
@@ -20,7 +20,7 @@
packages = [
pkgs.pkg-config
pkgs.liburing
self'.packages.rust-jemalloc-sys-unprefixed'
pkgs.rust-jemalloc-sys-unprefixed
rocksdbAllFeatures
];
env.LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.llvmPackages.libclang.lib ];