factor out shared things

This commit is contained in:
Charles Hall 2023-04-04 17:52:15 -07:00
parent 55149e3336
commit 3be32c4dac
No known key found for this signature in database
GPG key ID: 7B8E0645816E07CF

View file

@ -41,6 +41,11 @@
ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb_6_23}/include"; ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb_6_23}/include";
ROCKSDB_LIB_DIR = "${pkgs.rocksdb_6_23}/lib"; ROCKSDB_LIB_DIR = "${pkgs.rocksdb_6_23}/lib";
# Shared between the package and the devShell
nativeBuildInputs = (with pkgs.rustPlatform; [
bindgenHook
]);
builder = builder =
((crane.mkLib pkgs).overrideToolchain toolchain.toolchain).buildPackage; ((crane.mkLib pkgs).overrideToolchain toolchain.toolchain).buildPackage;
in in
@ -51,9 +56,7 @@
# Use system RocksDB # Use system RocksDB
inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR; inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR;
nativeBuildInputs = (with pkgs.rustPlatform; [ inherit nativeBuildInputs;
bindgenHook
]);
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
@ -65,9 +68,7 @@
inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR; inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR;
# Development tools # Development tools
nativeBuildInputs = (with pkgs.rustPlatform; [ nativeBuildInputs = nativeBuildInputs ++ (with toolchain; [
bindgenHook
]) ++ (with toolchain; [
cargo cargo
clippy clippy
rust-src rust-src