From d8e27096f2d153bbff88460e7ddff17bee886d5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 12 Mar 2020 02:46:52 +0100 Subject: [PATCH] gitstatus: Fix build of the internally used libgit2 fork In 6733ece `-DUSE_HTTP_PARSER=system` was introduced, which does not seem to work with this fork. So instead fallback to the `builtin`. Also sync with upstream cmake flags. --- .../git-and-tools/gitstatus/romkatv_libgit2.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 1279e5dd6c99..e4cd58bf0f02 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -2,13 +2,15 @@ libgit2.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DUSE_BUNDLED_ZLIB=ON" - "-DUSE_ICONV=OFF" "-DBUILD_CLAR=OFF" - "-DUSE_SSH=OFF" - "-DUSE_HTTPS=OFF" "-DBUILD_SHARED_LIBS=OFF" - "-DUSE_EXT_HTTP_PARSER=OFF" + "-DREGEX_BACKEND=builtin" + "-DUSE_BUNDLED_ZLIB=ON" + "-DUSE_HTTPS=OFF" + "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 + "-DUSE_ICONV=OFF" + "-DUSE_SSH=OFF" + "-DZERO_NSEC=ON" ]; src = fetchFromGitHub { owner = "romkatv";