From 207979579c4cd1f2b1095233fb63a3211b52843f Mon Sep 17 00:00:00 2001 From: Benjamin Lee Date: Fri, 24 May 2024 17:04:34 -0700 Subject: [PATCH] fix dynamically linked devshell This failed to inherit the fix from bec507d7390dda9ca2e624ef846521a20e2252c7 because the crane package's buildInputs become propagatedBuildInputs in a static stdenv, but become normal buildInputs in a dynamic stdenv. Since we were only pulling propagatedBuildInputs into the devshell, dynamically linked devshells did not include the rust-jemalloc-sys package. This causes tikv-jemalloc-sys to build it's own static jemalloc package, and we end up loading libc before jemalloc at runtime. --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 010181fb..3f86cb42 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,7 @@ # Useful for editing the book locally mdbook ]) + ++ scope.main.buildInputs ++ scope.main.propagatedBuildInputs ++ scope.main.nativeBuildInputs;