From 9afdd82862d68a2fa72af60cf10e12e7b4e44bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 3 Sep 2020 08:17:19 +0200 Subject: [PATCH 1/2] broot: 0.20.3 -> 1.0.0 Changelog: https://github.com/Canop/broot/releases/tag/v1.0.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 7387270b737..cd9d8bc0d9a 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.20.3"; + version = "1.0.0"; src = fetchCrate { inherit pname version; - sha256 = "0vw956c5xpjsbd9b0ardvgi9jjqb230m2x5n4h9ai0yiwizc8rh6"; + sha256 = "1dc6lb6ihj4s0mcp1say16j9yr61jdbzhmayxxsm4ansngbzmw45"; }; - cargoSha256 = "1zl4p3n327iq7nm7hi79zjxv2gvw9f3lwgkg1qp52kycv1af5gqp"; + cargoSha256 = "0nqmincayjv1snxz94i14fypc9dv69fxfqqdz3qbcvc2cs62zayg"; nativeBuildInputs = [ makeWrapper installShellFiles ]; 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 2/2] 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/'