From 2ae4f94054dd18d61e01beb2dade7d1631fd99a6 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Mon, 16 Dec 2024 15:12:05 -0800 Subject: [PATCH] bat: unvendor zlib; fix darwin bat fails with > error: failed to run custom build command for `libz-sys v1.1.8` due to the vendored libz failing to build with clang-19 the apple-sdk_11 can also be removed as that is now the default for both darwin x64 and aarch64 --- pkgs/by-name/ba/bat/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix index 2084af6469fa..d40bc370aeee 100644 --- a/pkgs/by-name/ba/bat/package.nix +++ b/pkgs/by-name/ba/bat/package.nix @@ -5,10 +5,9 @@ fetchFromGitHub, pkg-config, less, - libiconv, installShellFiles, makeWrapper, - apple-sdk_11, + zlib, }: rustPlatform.buildRustPackage rec { @@ -29,9 +28,8 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - apple-sdk_11 + buildInputs = [ + zlib ]; postInstall = ''