Since we use crane.buildPackage we need to use cargoExtraArgs
Signed-off-by: morguldir <morguldir@protonmail.com>
This commit is contained in:
10
flake.nix
10
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));
|
rocksdb' = (if allocator == "jemalloc" then (pkgs.rocksdb.override { enableJemalloc = true; }) else (rocksdb' pkgs));
|
||||||
|
|
||||||
# This is redundant with CI
|
# This is redundant with CI
|
||||||
@@ -190,7 +185,10 @@
|
|||||||
env = env pkgs;
|
env = env pkgs;
|
||||||
nativeBuildInputs = nativeBuildInputs 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;
|
meta.mainProgram = cargoToml.package.name;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user