dolysis
/
conduwuit
mirror of https://github.com/girlbossceo/conduwuit.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nix: remove jemalloc (now default) targets, add jq input for default 

jq input change was from 17eb354590
to prevent unnecessary bindgen rebuilds

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-05-21 21:01:39 -04:00 committed by June 🍓🦴
parent 0914aaa1b6
commit ba2f22b5d3
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
flake.nix
View File

@ -105,11 +105,6 @@
hmalloc = scopeHost.main.override { features = ["hardened_malloc"]; }; hmalloc = scopeHost.main.override { features = ["hardened_malloc"]; };
oci-image = scopeHost.oci-image; oci-image = scopeHost.oci-image;
oci-image-jemalloc = scopeHost.oci-image.override {
main = scopeHost.main.override {
features = ["jemalloc"];
};
};
oci-image-hmalloc = scopeHost.oci-image.override { oci-image-hmalloc = scopeHost.oci-image.override {
main = scopeHost.main.override { main = scopeHost.main.override {
features = ["hardened_malloc"]; features = ["hardened_malloc"];
@ -144,14 +139,6 @@
value = scopeCrossStatic.main; value = scopeCrossStatic.main;
} }
# An output for a statically-linked binary with jemalloc
{
name = "${binaryName}-jemalloc";
value = scopeCrossStatic.main.override {
features = ["jemalloc"];
};
}
# An output for a statically-linked binary with hardened_malloc # An output for a statically-linked binary with hardened_malloc
{ {
name = "${binaryName}-hmalloc"; name = "${binaryName}-hmalloc";
@ -166,16 +153,6 @@
value = scopeCrossStatic.oci-image; value = scopeCrossStatic.oci-image;
} }
# An output for an OCI image based on that binary with jemalloc
{
name = "oci-image-${crossSystem}-jemalloc";
value = scopeCrossStatic.oci-image.override {
main = scopeCrossStatic.main.override {
features = ["jemalloc"];
};
};
}
# An output for an OCI image based on that binary with hardened_malloc # An output for an OCI image based on that binary with hardened_malloc
{ {
name = "oci-image-${crossSystem}-hmalloc"; name = "oci-image-${crossSystem}-hmalloc";

13
nix/pkgs/main/default.nix
View File

@ -1,6 +1,7 @@
# Dependencies (keep sorted) # Dependencies (keep sorted)
{ craneLib { craneLib
, inputs , inputs
, jq
, lib , lib
, libiconv , libiconv
, liburing , liburing
@ -87,6 +88,9 @@ buildDepsOnlyEnv =
}); });
in in
{ {
# https://crane.dev/faq/rebuilds-bindgen.html
NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
CARGO_PROFILE = profile; CARGO_PROFILE = profile;
ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include"; ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
ROCKSDB_LIB_DIR = "${rocksdb'}/lib"; ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
@ -146,6 +150,12 @@ commonAttrs = {
# weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the # weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't quite do the
# right thing here. # right thing here.
pkgsBuildHost.rustPlatform.bindgenHook pkgsBuildHost.rustPlatform.bindgenHook
# We don't actually depend on `jq`, but crane's `buildPackage` does, but
# its `buildDepsOnly` doesn't. This causes those two derivations to have
# differing values for `NIX_CFLAGS_COMPILE`, which contributes to spurious
# rebuilds of bindgen and its depedents.
jq
] ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [
# https://github.com/NixOS/nixpkgs/issues/206242 # https://github.com/NixOS/nixpkgs/issues/206242
@ -173,9 +183,6 @@ craneLib.buildPackage ( commonAttrs // {
cargoCheckCommand = ""; cargoCheckCommand = "";
doCheck = false; doCheck = false;
# https://crane.dev/faq/rebuilds-bindgen.html
NIX_OUTPATH_USED_AS_RANDOM_SEED = "aaaaaaaaaa";
env = buildPackageEnv; env = buildPackageEnv;
passthru = { passthru = {