From fca52043a53e2b059675ffe190163d9c50cb0008 Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 17 Oct 2019 07:08:32 +0000 Subject: [PATCH] git-series: use nixpkgs libgit2 This replaces the vendored copy from libgit2-sys. --- pkgs/development/tools/git-series/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 52969609e36c..09691aecb93d 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib, curl }: +{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2 }: with rustPlatform; @@ -27,8 +27,9 @@ buildRustPackage rec { }) ]; + LIBGIT2_SYS_USE_PKG_CONFIG = true; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ openssl zlib curl ]; + buildInputs = [ openssl zlib curl libgit2 ]; postBuild = '' install -D "$src/git-series.1" "$out/man/man1/git-series.1"