about summary refs log tree commit diff
path: root/pkgs/applications/version-management/gitlab
diff options
context:
space:
mode:
authorMilan Pässler <milan@petabyte.dev>2020-11-24 21:56:11 +0100
committerMilan Pässler <milan@petabyte.dev>2020-11-26 14:12:14 +0100
commit72ba4fce76f46fbc5fd3139884db904c9894b811 (patch)
treee4bb45d7daae3fca701332d7fd8155452d257dc8 /pkgs/applications/version-management/gitlab
parentc1c2ff4a97a040446d95dd7c041e8f3d44c6b53d (diff)
gitaly: build with system libgit2
Diffstat (limited to 'pkgs/applications/version-management/gitlab')
-rw-r--r--pkgs/applications/version-management/gitlab/gitaly/default.nix9
1 files 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 5d60dae8603f9..57465f808df5d 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 = ''