From e173e222e6f6a66cdfd24b2f572c7d36d4a8c6ff Mon Sep 17 00:00:00 2001 From: Lilah Tascheter Date: Wed, 22 Jan 2025 16:31:09 -0600 Subject: [PATCH] gnu: git-minimal: Fix locating /etc/gitconfig. * gnu/packages/version-control.scm (git-minimal)[arguments]: Add configure flag to properly recognize the system gitconfig. (git-minimal/pinned)[arguments]: Use old arguments as to not force rebuild. Change-Id: I7f31d16aa6c7ab062f300019f1f862b561ece2d3 Signed-off-by: Sharlatan Hellseher --- gnu/packages/version-control.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 944c99b8bf9..02e393808c8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -339,9 +339,8 @@ Python 3.3 and later, rather than on Python 2.") #:disallowed-references (list bash perl) #:test-target "test" #:configure-flags - (if (%current-target-system) - git-cross-configure-flags - #~(list)) + #~(cons "--with-gitconfig=/etc/gitconfig" + #$(if (%current-target-system) git-cross-configure-flags #~(list))) #:make-flags #~(list "V=1" ;more verbose compilation (string-append "SHELL_PATH=" @@ -820,7 +819,12 @@ everything from small to very large projects with speed and efficiency.") version ".tar.xz")) (sha256 (base32 - "0if0vqn3fj22p95a0125zpgwz3mqfqxqnvwa7fkf7b00wh0c1wyz")))))) + "0if0vqn3fj22p95a0125zpgwz3mqfqxqnvwa7fkf7b00wh0c1wyz")))) + ;; Temporary measure to prevent unneccessary package rebuilds. + (arguments + (substitute-keyword-arguments (package-arguments git-minimal) + ((#:configure-flags flags #~'()) + (if (%current-target-system) git-cross-configure-flags #~(list))))))) (define-public python-klaus (package