diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2020-03-12 02:46:52 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2020-03-12 11:23:36 +0100 |
| commit | d8e27096f2d153bbff88460e7ddff17bee886d5c (patch) | |
| tree | abd053409888e251fa5e875f0a31b84063854564 /pkgs/applications/version-management/git-and-tools | |
| parent | 2220060133512405fb015f0c0f195a4e6c4dd6eb (diff) | |
| download | nixlib-d8e27096f2d153bbff88460e7ddff17bee886d5c.tar nixlib-d8e27096f2d153bbff88460e7ddff17bee886d5c.tar.gz nixlib-d8e27096f2d153bbff88460e7ddff17bee886d5c.tar.bz2 nixlib-d8e27096f2d153bbff88460e7ddff17bee886d5c.tar.lz nixlib-d8e27096f2d153bbff88460e7ddff17bee886d5c.tar.xz nixlib-d8e27096f2d153bbff88460e7ddff17bee886d5c.tar.zst nixlib-d8e27096f2d153bbff88460e7ddff17bee886d5c.zip | |
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.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix | 10 |
1 files changed, 6 insertions, 4 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 ++ [ + "-DBUILD_CLAR=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DREGEX_BACKEND=builtin" "-DUSE_BUNDLED_ZLIB=ON" + "-DUSE_HTTPS=OFF" + "-DUSE_HTTP_PARSER=builtin" # overwritten from libgit2 "-DUSE_ICONV=OFF" - "-DBUILD_CLAR=OFF" "-DUSE_SSH=OFF" - "-DUSE_HTTPS=OFF" - "-DBUILD_SHARED_LIBS=OFF" - "-DUSE_EXT_HTTP_PARSER=OFF" + "-DZERO_NSEC=ON" ]; src = fetchFromGitHub { owner = "romkatv"; |