03/07: gnu: libgit2: Use system http-parser.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 158b8600c9d49ba6954a6ac824a7880cc3344b70
Author: Nicolò Balzarotti <address@hidden>
AuthorDate: Thu Apr 2 11:54:15 2020 +0200

    gnu: libgit2: Use system http-parser.
    
    * gnu/packages/version-control.scm (libgit2)[source]: Update snippet.
    [arguments]: Add configure-flag to use system http-parser.
    [inputs]: Add http-parser.
    
    Signed-off-by: Efraim Flashner <address@hidden>
---
 gnu/packages/version-control.scm | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8dc59d0..ac88515 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -612,25 +612,15 @@ on @command{git}, and use any regular Git hosting 
service.")
                (base32
                 "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg"))
               (patches (search-patches "libgit2-mtime-0.patch"))
-
-              ;; Remove bundled software.  Keep "http-parser" because it
-              ;; contains patches that are not available in the system version.
               (snippet '(begin
-                          (with-directory-excursion "deps"
-                            (for-each (lambda (dir)
-                                        (delete-file-recursively dir))
-                                      (lset-difference equal?
-                                                       (scandir ".")
-                                                       '("." ".." 
"http-parser"))))
-                          #t))
-              (modules '((guix build utils)
-                         (srfi srfi-1)
-                         (ice-9 ftw)))))
+                          (delete-file-recursively "deps") #t))
+              (modules '((guix build utils)))))
     (build-system cmake-build-system)
     (outputs '("out" "debug"))
     (arguments
      `(#:configure-flags '("-DUSE_NTLMCLIENT=OFF" ;TODO: package this
-                           "-DREGEX_BACKEND=pcre2")
+                           "-DREGEX_BACKEND=pcre2"
+                           "-DUSE_HTTP_PARSER=system")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-pcre2-reference
@@ -657,7 +647,8 @@ on @command{git}, and use any regular Git hosting service.")
          (replace 'check
            (lambda _ (invoke "./libgit2_clar" "-v" "-Q"))))))
     (inputs
-     `(("libssh2" ,libssh2)))
+     `(("libssh2" ,libssh2)
+       ("http-parser" ,http-parser)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python" ,python)))