From 05a480c3af6fed341033979a2a69dbd46caa5ac2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:07:43 +1000 Subject: [PATCH] libgit2: switch to pcre2 pcre is EOL --- pkgs/development/libraries/libgit2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 847894d06587..72c52ea899eb 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -7,7 +7,7 @@ , zlib , libssh2 , openssl -, pcre +, pcre2 , libiconv , Security , staticBuild ? stdenv.hostPlatform.isStatic @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { }; cmakeFlags = [ + "-DREGEX_BACKEND=pcre2" "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" (lib.cmakeBool "USE_GSSAPI" withGssapi) @@ -47,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake python3 pkg-config ]; - buildInputs = [ zlib libssh2 openssl pcre llhttp ] + buildInputs = [ zlib libssh2 openssl pcre2 llhttp ] ++ lib.optional withGssapi krb5 ++ lib.optional stdenv.hostPlatform.isDarwin Security;