JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgit2: unbundle pcre (#85049)

Browse Source 
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".
This commit is contained in:
Orivej Desh 2020-04-12 19:59:55 +00:00 committed by GitHub
parent d4684cf612
commit ecb36271a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/git2/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python3 { stdenv, fetchFromGitHub, cmake, pkgconfig, python3
, zlib, libssh2, openssl, http-parser , zlib, libssh2, openssl, pcre, http-parser
, libiconv, Security , libiconv, Security
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake python3 pkgconfig ]; nativeBuildInputs = [ cmake python3 pkgconfig ];
buildInputs = [ zlib libssh2 openssl http-parser ] buildInputs = [ zlib libssh2 openssl pcre http-parser ]
++ stdenv.lib.optional stdenv.isDarwin Security; ++ stdenv.lib.optional stdenv.isDarwin Security;
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;