From ecb36271a284a4bf82f18f810dadef37dfb0d2db Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 12 Apr 2020 19:59:55 +0000 Subject: [PATCH] libgit2: unbundle pcre (#85049) libgit2 has bundled pcre (not pcre2) in https://github.com/libgit2/libgit2/pull/4935 Before this change configure printed "regex, using bundled PCRE", after this change it prints "regex, using system PCRE". --- pkgs/development/libraries/git2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 8d52f190d016..3f0279950338 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, python3 -, zlib, libssh2, openssl, http-parser +, zlib, libssh2, openssl, pcre, http-parser , libiconv, Security }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 pkgconfig ]; - buildInputs = [ zlib libssh2 openssl http-parser ] + buildInputs = [ zlib libssh2 openssl pcre http-parser ] ++ stdenv.lib.optional stdenv.isDarwin Security; propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;