jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-26 19:22:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tiny refactor

Browse Source
This commit is contained in:
Charles Hall 2023-04-04 19:15:09 -07:00
parent 3be32c4dac
commit a6712627e4
No known key found for this signature in database
GPG Key ID: 7B8E0645816E07CF
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flake.nix
View File

@ -37,7 +37,7 @@
sha256 = "sha256-8len3i8oTwJSOJZMosGGXHBL5BVuGQnWOT2St5YAUFU="; sha256 = "sha256-8len3i8oTwJSOJZMosGGXHBL5BVuGQnWOT2St5YAUFU=";
}; };
# Point to system RocksDB # The system's RocksDB
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";
@ -53,10 +53,10 @@
packages.default = builder { packages.default = builder {
src = ./.; src = ./.;
# Use system RocksDB inherit
inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR; nativeBuildInputs
ROCKSDB_INCLUDE_DIR
inherit nativeBuildInputs; ROCKSDB_LIB_DIR;
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
@ -64,8 +64,9 @@
# sources, and it can read this environment variable to do so # sources, and it can read this environment variable to do so
RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library"; RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library";
# Use system RocksDB inherit
inherit ROCKSDB_INCLUDE_DIR ROCKSDB_LIB_DIR; ROCKSDB_INCLUDE_DIR
ROCKSDB_LIB_DIR;
# Development tools # Development tools
nativeBuildInputs = nativeBuildInputs ++ (with toolchain; [ nativeBuildInputs = nativeBuildInputs ++ (with toolchain; [