From d2cef6437cefd5ea75aba26fd1caaea2807e0a62 Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Thu, 16 May 2024 20:25:45 -0300 Subject: [PATCH] bonsai: make use of hareHook --- pkgs/by-name/bo/bonsai/package.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix index 645b2598de00..98b19be7e6fc 100644 --- a/pkgs/by-name/bo/bonsai/package.nix +++ b/pkgs/by-name/bo/bonsai/package.nix @@ -3,7 +3,7 @@ lib, fetchFromSourcehut, gitUpdater, - hare, + hareHook, hareThirdParty, }: @@ -19,27 +19,17 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - hare + hareHook hareThirdParty.hare-ev hareThirdParty.hare-json ]; - makeFlags = [ - "PREFIX=${builtins.placeholder "out"}" - "HARECACHE=.harecache" - "HAREFLAGS=-qa${stdenv.hostPlatform.uname.processor}" - ]; + makeFlags = [ "PREFIX=${builtins.placeholder "out"}" ]; enableParallelBuilding = true; doCheck = true; - postPatch = '' - substituteInPlace Makefile \ - --replace 'hare build' 'hare build $(HAREFLAGS)' \ - --replace 'hare test' 'hare test $(HAREFLAGS)' - ''; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; {