Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
conduwuit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
🥺
conduwuit
Commits
3be32c4d
Unverified
Commit
3be32c4d
authored
1 year ago
by
Charles Hall
Browse files
Options
Downloads
Patches
Plain Diff
factor out shared things
parent
55149e33
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
flake.nix
+7
-6
7 additions, 6 deletions
flake.nix
with
7 additions
and
6 deletions
flake.nix
+
7
−
6
View file @
3be32c4d
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment