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
db81ffb4
Commit
db81ffb4
authored
10 months ago
by
🥺
Committed by
🥺
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
nix: only set `CONDUIT_VERSION_EXTRA` for final build + slight cleanup
Signed-off-by:
strawberry
<
strawberry@puppygock.gay
>
parent
096c252d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
nix/pkgs/main/default.nix
+67
-47
67 additions, 47 deletions
nix/pkgs/main/default.nix
with
67 additions
and
47 deletions
nix/pkgs/main/default.nix
+
67
−
47
View file @
db81ffb4
{
inputs
# Dependencies
,
craneLib
# Dependencies (keep sorted)
{
craneLib
,
inputs
,
lib
,
libiconv
,
pkgsBuildHost
...
...
@@ -9,54 +8,72 @@
,
rust
,
stdenv
# Options
# Options
(keep sorted)
,
default_features
?
true
,
features
?
[]
,
profile
?
"release"
}:
craneLib
.
buildPackage
rec
{
src
=
inputs
.
nix-filter
{
root
=
inputs
.
self
;
include
=
[
"src"
"hot_lib"
"Cargo.toml"
"Cargo.lock"
];
};
let
buildDepsOnlyEnv
=
let
rocksdb
'
=
rocksdb
.
override
{
enableJemalloc
=
builtins
.
elem
"jemalloc"
features
;
};
in
{
CARGO_PROFILE
=
profile
;
ROCKSDB_INCLUDE_DIR
=
"
${
rocksdb
'
}
/include"
;
ROCKSDB_LIB_DIR
=
"
${
rocksdb
'
}
/lib"
;
}
//
(
import
./cross-compilation-env.nix
{
# Keep sorted
inherit
lib
pkgsBuildHost
rust
stdenv
;
});
# This is redundant with CI
doCheck
=
false
;
buildPackageEnv
=
{
CONDUIT_VERSION_EXTRA
=
inputs
.
self
.
shortRev
or
inputs
.
self
.
dirtyShortRev
;
}
//
buildDepsOnlyEnv
;
commonAttrs
=
{
inherit
(
craneLib
.
crateNameFromCargoToml
{
cargoToml
=
"
${
inputs
.
self
}
/Cargo.toml"
;
})
pname
version
;
src
=
let
filter
=
inputs
.
nix-filter
.
lib
;
in
filter
{
root
=
inputs
.
self
;
env
=
let
rocksdb
'
=
rocksdb
.
override
{
enableJemalloc
=
builtins
.
elem
"jemalloc"
features
;
};
in
{
CARGO_PROFILE
=
profile
;
CONDUIT_VERSION_EXTRA
=
inputs
.
self
.
shortRev
or
inputs
.
self
.
dirtyShortRev
;
ROCKSDB_INCLUDE_DIR
=
"
${
rocksdb
'
}
/include"
;
ROCKSDB_LIB_DIR
=
"
${
rocksdb
'
}
/lib"
;
}
//
(
import
./cross-compilation-env.nix
{
inherit
lib
pkgsBuildHost
rust
stdenv
;
});
# Keep sorted
include
=
[
"Cargo.lock"
"Cargo.toml"
"hot_lib"
"src"
];
};
nativeBuildInputs
=
[
# bindgen needs the build platform's libclang. Apparently due to "splicing
# weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
# right thing here.
pkgsBuildHost
.
rustPlatform
.
bindgenHook
nativeBuildInputs
=
[
# bindgen needs the build platform's libclang. Apparently due to "splicing
# weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
# right thing here.
pkgsBuildHost
.
rustPlatform
.
bindgenHook
]
++
lib
.
optionals
stdenv
.
isDarwin
[
libiconv
];
};
in
craneLib
.
buildPackage
(
commonAttrs
//
{
cargoArtifacts
=
craneLib
.
buildDepsOnly
(
commonAttrs
//
{
env
=
buildDepsOnlyEnv
;
});
cargoExtraArgs
=
""
+
lib
.
optionalString
...
...
@@ -66,11 +83,14 @@ craneLib.buildPackage rec {
(
features
!=
[])
"--features "
+
(
builtins
.
concatStringsSep
","
features
);
meta
.
mainProgram
=
(
craneLib
.
crateNameFromCargoToml
{
cargoToml
=
"
${
inputs
.
self
}
/Cargo.toml"
;
})
.
pname
;
# This is redundant with CI
doCheck
=
false
;
env
=
buildPackageEnv
;
passthru
=
{
inherit
e
nv
;
env
=
buildPackageE
nv
;
};
}
meta
.
mainProgram
=
commonAttrs
.
pname
;
})
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