magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix: drop hardened_malloc feature from all-features builds

Browse source 
this is non-functional and i've spent far too long trying to figure
out what the issue is

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-07-07 13:38:38 -04:00 • committed by June 🍓🦴
parent 438911c18d
commit 7a4bbe2ff6
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.nix
View file

@ -114,13 +114,19 @@
{ {
packages = { packages = {
default = scopeHost.main; default = scopeHost.main;
all-features = scopeHost.main.override { all_features = true; }; all-features = scopeHost.main.override {
all_features = true;
# this is non-functional on nix for some reason
disable_features = ["hardened_malloc"];
};
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-all-features = scopeHost.oci-image.override { oci-image-all-features = scopeHost.oci-image.override {
main = scopeHost.main.override { main = scopeHost.main.override {
all_features = true; all_features = true;
# this is non-functional on nix for some reason
disable_features = ["hardened_malloc"];
}; };
}; };
oci-image-hmalloc = scopeHost.oci-image.override { oci-image-hmalloc = scopeHost.oci-image.override {
@ -162,6 +168,8 @@
name = "${binaryName}-all-features"; name = "${binaryName}-all-features";
value = scopeCrossStatic.main.override { value = scopeCrossStatic.main.override {
all_features = true; all_features = true;
# this is non-functional on nix for some reason
disable_features = ["hardened_malloc"];
}; };
} }
@ -185,6 +193,8 @@
value = scopeCrossStatic.oci-image.override { value = scopeCrossStatic.oci-image.override {
main = scopeCrossStatic.main.override { main = scopeCrossStatic.main.override {
all_features = true; all_features = true;
# this is non-functional on nix for some reason
disable_features = ["hardened_malloc"];
}; };
}; };
} }
@ -210,7 +220,11 @@
devShells.default = mkDevShell scopeHostStatic; devShells.default = mkDevShell scopeHostStatic;
devShells.all-features = mkDevShell devShells.all-features = mkDevShell
(scopeHostStatic.overrideScope (final: prev: { (scopeHostStatic.overrideScope (final: prev: {
main = prev.main.override { all_features = true; }; main = prev.main.override {
all_features = true;
# this is non-functional on nix for some reason
disable_features = ["hardened_malloc"];
};
})); }));
devShells.no-features = mkDevShell devShells.no-features = mkDevShell
(scopeHostStatic.overrideScope (final: prev: { (scopeHostStatic.overrideScope (final: prev: {