chore(nix): fix missing zlib in nix devshell

hawkw · Jul 25, 2024 · d9bc76b · d9bc76b
1 parent c499252
commit d9bc76b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/default.nix b/default.nix
@@ -15,6 +15,7 @@ pkgs.buildEnv {
       rustup
       pkg-config
       openssl
+      zlib
       (glibcLocales.override { locales = [ "en_US.UTF-8" ]; })
     ] ++ lib.optional stdenv.isDarwin [ Security libiconv ];
   passthru = with pkgs; {
@@ -27,5 +28,6 @@ pkgs.buildEnv {
     CURL_CA_BUNDLE = "${cacert}/etc/ca-bundle.crt";
     CARGO_TERM_COLOR = "always";
     RUST_BACKTRACE = "full";
+    LD_LIBRARY_PATH = "${lib.makeLibraryPath [ zlib ]}";
   };
 }
diff --git a/shell.nix b/shell.nix
@@ -4,7 +4,9 @@ let env = (import ./default.nix scope);
 
 in pkgs.mkShell {
   # also install qemu into the dev shell, for testing
-  packages = with pkgs; [ qemu gdb direnv just cargo-nextest ];
+  packages = with pkgs; [ qemu gdb direnv just cargo-nextest ]
+    ++ env.buildInputs
+    ++ env.nativeBuildInputs;
 
   LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
   LC_ALL = "en_US.UTF-8";