From 9f4a1578aa9beaf5f45f1d3ff321accb8a03b579 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Thu, 24 Oct 2024 14:54:39 -0700 Subject: [PATCH] move rocksdb to its own file --- flake.nix | 4 ++++ nix/pkgs/default/default.nix | 2 -- nix/pkgs/rocksdb/default.nix | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 nix/pkgs/rocksdb/default.nix diff --git a/flake.nix b/flake.nix index d8e4365a..55d0f9b8 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,10 @@ default = prev.default.override args; }); + rocksdb = self.callPackage ./nix/pkgs/rocksdb { + inherit (pkgs) rocksdb; + }; + rust-jemalloc-sys = self.callPackage ./nix/pkgs/rust-jemalloc-sys { inherit (pkgs) rust-jemalloc-sys; }; diff --git a/nix/pkgs/default/default.nix b/nix/pkgs/default/default.nix index d46a3d81..7aa9151e 100644 --- a/nix/pkgs/default/default.nix +++ b/nix/pkgs/default/default.nix @@ -37,9 +37,7 @@ let buildDepsOnlyEnv = let rocksdb' = rocksdb.override { - jemalloc = rust-jemalloc-sys; enableJemalloc = featureEnabled "jemalloc"; - enableLiburing = false; }; in { diff --git a/nix/pkgs/rocksdb/default.nix b/nix/pkgs/rocksdb/default.nix new file mode 100644 index 00000000..ad18fdcc --- /dev/null +++ b/nix/pkgs/rocksdb/default.nix @@ -0,0 +1,14 @@ +# Dependencies (keep sorted) +{ rocksdb +, rust-jemalloc-sys + +# Options (keep sorted) +, enableJemalloc ? false +}: + +rocksdb.override { + jemalloc = rust-jemalloc-sys; + + enableLiburing = false; + inherit enableJemalloc; +}