From 915643c9655135e8194d27decc85ec45749cc379 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 3 Apr 2026 11:12:49 -0400 Subject: [PATCH] feat: overridable rocksdb --- nix/packages/continuwuity.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/nix/packages/continuwuity.nix b/nix/packages/continuwuity.nix index fc48ec8d7..d9f577049 100644 --- a/nix/packages/continuwuity.nix +++ b/nix/packages/continuwuity.nix @@ -1,13 +1,14 @@ { lib, self, - craneLib, - callPackage, - pkg-config, - rustPlatform, - liburing, stdenv, + liburing, + craneLib, + pkg-config, + callPackage, + rustPlatform, cargoExtraArgs ? "", + rocksdb ? callPackage ./rocksdb.nix { }, }: let # see https://crane.dev/API.html#cranelibfiltercargosources @@ -24,8 +25,6 @@ let name = "source"; }; - rocksdb = callPackage ./rocksdb.nix { }; - attrs = { inherit src; nativeBuildInputs = [ @@ -38,13 +37,11 @@ let ROCKSDB_LIB_DIR = "${rocksdb}/lib"; }; }; - - cargoArtifacts = craneLib.buildDepsOnly attrs; - in craneLib.buildPackage ( lib.recursiveUpdate attrs { - inherit cargoArtifacts cargoExtraArgs; + inherit cargoExtraArgs; + cargoArtifacts = craneLib.buildDepsOnly attrs; # Needed to make continuwuity link to rocksdb postFixup = ''