From 7a4bbe2ff665568aa0cfa807e75551baf08f8aec Mon Sep 17 00:00:00 2001 From: strawberry Date: Sun, 7 Jul 2024 13:38:38 -0400 Subject: [PATCH] nix: drop hardened_malloc feature from all-features builds this is non-functional and i've spent far too long trying to figure out what the issue is Signed-off-by: strawberry --- flake.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index ae8533b9..8315c6e1 100644 --- a/flake.nix +++ b/flake.nix @@ -114,13 +114,19 @@ { packages = { 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"]; }; oci-image = scopeHost.oci-image; oci-image-all-features = scopeHost.oci-image.override { main = scopeHost.main.override { all_features = true; + # this is non-functional on nix for some reason + disable_features = ["hardened_malloc"]; }; }; oci-image-hmalloc = scopeHost.oci-image.override { @@ -162,6 +168,8 @@ name = "${binaryName}-all-features"; value = scopeCrossStatic.main.override { 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 { main = scopeCrossStatic.main.override { 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.all-features = mkDevShell (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 (scopeHostStatic.overrideScope (final: prev: {