From 72ba4fce76f46fbc5fd3139884db904c9894b811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Tue, 24 Nov 2020 21:56:11 +0100 Subject: [PATCH] gitaly: build with system libgit2 --- .../version-management/gitlab/gitaly/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5d60dae8603f..57465f808df5 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby, - bundlerEnv, pkgconfig, libgit2_0_27 }: +{ stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby +, bundlerEnv, pkgconfig +# libgit2 + dependencies +, libgit2, openssl, zlib, pcre, http-parser }: let rubyEnv = bundlerEnv rec { @@ -35,8 +37,9 @@ in buildGoModule rec { inherit rubyEnv; }; + buildFlags = [ "-tags=static,system_libgit2" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; doCheck = false; postInstall = ''