From 22bb5607ed8060cbae0190f205ee3eb5a8431875 Mon Sep 17 00:00:00 2001 From: Joshua Gilman Date: Fri, 16 Sep 2022 10:54:42 -0700 Subject: [PATCH] cocogitto: refactor to use libgit2 --- pkgs/development/tools/cocogitto/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index b07946e70bb7..52fdf0c1e400 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, git }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, libgit2 }: rustPlatform.buildRustPackage rec { pname = "cocogitto"; @@ -17,18 +17,15 @@ rustPlatform.buildRustPackage rec { # and might be failing to create the test repository it works in. doCheck = false; - nativeBuildInputs = [ installShellFiles makeWrapper ]; + nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = [ libgit2 ] ++ lib.optional stdenv.isDarwin Security; postInstall = '' installShellCompletion --cmd cog \ --bash <($out/bin/cog generate-completions bash) \ --fish <($out/bin/cog generate-completions fish) \ --zsh <($out/bin/cog generate-completions zsh) - - wrapProgram $out/bin/cog \ - --prefix PATH : "${lib.makeBinPath [ git ]}" ''; meta = with lib; {