From c4f6645eda4f28e0dc3f6ee7e1270d0f05e4d843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 3 Sep 2020 08:18:10 +0200 Subject: [PATCH] broot: fix Darwin build - The zlib-sys dependency requires zlib. - The cc crate, which is used by various dependent crates, now uses xcrun on Darwin. --- pkgs/tools/misc/broot/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index cd9d8bc0d9a..62ca179cfde 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -5,6 +5,8 @@ , makeWrapper , coreutils , libiconv +, xcbuild +, zlib , Security }: @@ -19,9 +21,17 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0nqmincayjv1snxz94i14fypc9dv69fxfqqdz3qbcvc2cs62zayg"; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ + makeWrapper + installShellFiles + xcbuild # The cc crate attempts to run xcbuild. + ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ + libiconv + Security + zlib + ]; postPatch = '' substituteInPlace src/verb/builtin.rs --replace '"/bin/' '"${coreutils}/bin/'