guix_mirror_bot pushed a commit to branch rust-team
in repository guix.
commit 2f676b3f8f867d0ec2a0d86bb756d095cb2d9c17
Author: Efraim Flashner <[email protected]>
AuthorDate: Tue Feb 10 19:34:29 2026 +0200
gnu: libgit2-1.9: Simplify configure-flags.
* gnu/packages/version-control.scm (libgit2-1.9)[arguments]: Remove the
workaround in the configure-flags.
Change-Id: Iffb3ddff86513dae69279cc4832cbdea8ac257d1
---
gnu/packages/version-control.scm | 38 ++++++++++++++++----------------------
1 file changed, 16 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 2a2aac4c81..3c9b3196e0 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1265,28 +1265,22 @@ other git-like projects such as @code{libgit2}.")
(outputs '("out" "debug"))
(arguments
`(#:configure-flags
- ;; TODO: Simplify this to just be a list. It is only like this to
- ;; avoid a large rebuild.
- (map (lambda (arg)
- (if (string= "-DUSE_HTTP_PARSER=system" arg)
- "-DUSE_HTTP_PARSER=http-parser"
- arg))
- (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this
- "-DREGEX_BACKEND=pcre2"
- "-DUSE_HTTP_PARSER=system"
- "-DUSE_SSH=ON" ; cmake fails to find libssh if this is
missing
- ,@(if (%current-target-system)
- `((string-append
- "-DPKG_CONFIG_EXECUTABLE="
- (search-input-file
- %build-inputs
- (string-append "/bin/" ,(%current-target-system)
- "-pkg-config"))))
- '())
- ;; See https://github.com/libgit2/libgit2/issues/7169
- ,@(if (target-64bit?)
- '()
- '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64"))))
+ (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this
+ "-DREGEX_BACKEND=pcre2"
+ "-DUSE_HTTP_PARSER=http-parser"
+ "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing
+ ,@(if (%current-target-system)
+ `((string-append
+ "-DPKG_CONFIG_EXECUTABLE="
+ (search-input-file
+ %build-inputs
+ (string-append "/bin/" ,(%current-target-system)
+ "-pkg-config"))))
+ '())
+ ;; See https://github.com/libgit2/libgit2/issues/7169
+ ,@(if (target-64bit?)
+ '()
+ '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64")))
#:phases
(modify-phases %standard-phases
;; Run checks more verbosely, unless we are cross-compiling.
