From 056c9d6920fbb3fc9bc58f5ee3b79aefc7c6af12 Mon Sep 17 00:00:00 2001 From: morguldir Date: Sat, 20 Apr 2024 03:06:40 +0200 Subject: [PATCH] Since we use crane.buildPackage we need to use cargoExtraArgs Signed-off-by: morguldir --- flake.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index cf9d4bcf..1777b76a 100644 --- a/flake.nix +++ b/flake.nix @@ -177,11 +177,6 @@ ]; }; - buildFeatures = [ ] - ++ (if allocator == "jemalloc" then [ "jemalloc" ] else [ ]) - ++ (if allocator == "hmalloc" then [ "hardened_malloc" ] else [ ]) - ; - rocksdb' = (if allocator == "jemalloc" then (pkgs.rocksdb.override { enableJemalloc = true; }) else (rocksdb' pkgs)); # This is redundant with CI @@ -190,7 +185,10 @@ env = env pkgs; nativeBuildInputs = nativeBuildInputs pkgs; - cargoExtraArgs = cargoArgs; + cargoExtraArgs = cargoArgs + + (if allocator == "jemalloc" then " --features jemalloc" else "") + + (if allocator == "hmalloc" then " --features hardened_malloc" else "") + ; meta.mainProgram = cargoToml.package.name;