diff options
| author | Orivej Desh <orivej@gmx.fr> | 2020-04-12 19:59:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 19:59:55 +0000 |
| commit | ecb36271a284a4bf82f18f810dadef37dfb0d2db (patch) | |
| tree | 72a0634c6d6d212cd0ddb87798a1516802c63f7b | |
| parent | d4684cf612997e12a68fbb68c357d05f959760a3 (diff) | |
| download | nixpkgs-ecb36271a284a4bf82f18f810dadef37dfb0d2db.tar nixpkgs-ecb36271a284a4bf82f18f810dadef37dfb0d2db.tar.gz nixpkgs-ecb36271a284a4bf82f18f810dadef37dfb0d2db.tar.bz2 nixpkgs-ecb36271a284a4bf82f18f810dadef37dfb0d2db.tar.lz nixpkgs-ecb36271a284a4bf82f18f810dadef37dfb0d2db.tar.xz nixpkgs-ecb36271a284a4bf82f18f810dadef37dfb0d2db.tar.zst nixpkgs-ecb36271a284a4bf82f18f810dadef37dfb0d2db.zip | |
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".
| -rw-r--r-- | pkgs/development/libraries/git2/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 8d52f190d01..3f027995033 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; |