Skip to content
Snippets Groups Projects
Unverified Commit 3be32c4d authored by Charles Hall's avatar Charles Hall
Browse files

factor out shared things

parent 55149e33
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,11 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment