matrix-continuwuity: use upstream default features
This commit is contained in:
@@ -10,20 +10,15 @@
|
||||
nix-update-script,
|
||||
testers,
|
||||
matrix-continuwuity,
|
||||
enableBlurhashing ? true,
|
||||
# upstream continuwuity enables jemalloc by default, so we follow suit
|
||||
enableJemalloc ? true,
|
||||
rust-jemalloc-sys-unprefixed,
|
||||
enableLiburing ? stdenv.hostPlatform.isLinux,
|
||||
liburing,
|
||||
nixosTests,
|
||||
}:
|
||||
let
|
||||
rocksdb' =
|
||||
(rocksdb.override {
|
||||
inherit enableLiburing;
|
||||
# rocksdb does not support prefixed jemalloc, which is required on darwin
|
||||
enableJemalloc = enableJemalloc && !stdenv.hostPlatform.isDarwin;
|
||||
enableJemalloc = !stdenv.hostPlatform.isDarwin;
|
||||
jemalloc = rust-jemalloc-sys-unprefixed;
|
||||
}).overrideAttrs
|
||||
(
|
||||
@@ -97,11 +92,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
buildInputs = [
|
||||
bzip2
|
||||
zstd
|
||||
]
|
||||
++ lib.optional enableJemalloc [
|
||||
rust-jemalloc-sys-unprefixed
|
||||
]
|
||||
++ lib.optional enableLiburing liburing;
|
||||
liburing
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
@@ -109,31 +102,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
|
||||
};
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
# See https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/Cargo.toml
|
||||
# for available features.
|
||||
# We enable all default features except jemalloc, blurhashing, and io_uring, which
|
||||
# we guard behind our own (default-enabled) flags.
|
||||
buildFeatures = [
|
||||
"brotli_compression"
|
||||
"direct_tls"
|
||||
"element_hacks"
|
||||
"gzip_compression"
|
||||
"media_thumbnail"
|
||||
"release_max_log_level"
|
||||
"systemd"
|
||||
"url_preview"
|
||||
"zstd_compression"
|
||||
"bindgen-runtime"
|
||||
"ldap"
|
||||
]
|
||||
++ lib.optional enableBlurhashing "blurhashing"
|
||||
++ lib.optional enableJemalloc [
|
||||
"jemalloc"
|
||||
"jemalloc_conf"
|
||||
]
|
||||
++ lib.optional enableLiburing "io_uring";
|
||||
|
||||
passthru = {
|
||||
rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
|
||||
updateScript = nix-update-script { };
|
||||
|
||||
Reference in New Issue
Block a user