(address . guix-patches@gnu.org)(address . ngraves@ngraves.fr)
* gnu/packages/version-control.scm (b4): Ensure git presence.
[arguments](phases): Add phase hardcode-git-bin.
[inputs]: Add git-minimal.
Change-Id: Ib2dca06009cdacc0e5ab4ab227cd30991474404c
---
gnu/packages/version-control.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
Toggle diff (24 lines)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8f9fae5ce2..b8b818c238 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2925,9 +2925,15 @@ (define-public b4
;; XXX: dnspython attempts to read /etc/resolv.conf when loading
;; resolver.py, which breaks the sanity check in dependent
;; packages. This should rather be fixed in dnspython.
- (delete 'sanity-check))))
+ (delete 'sanity-check)
+ (add-after 'unpack 'harcode-git-bin
+ (lambda _ ; This ensures git is present when called.
+ (substitute* (find-files "b4" "\\.py$")
+ (("'git'")
+ (string-append
+ "'" #$(this-package-input "git") "/bin/git'"))))))))
(inputs
- (list python-dkimpy python-dnspython python-requests))
+ (list python-dkimpy python-dnspython python-requests git-minimal))
(propagated-inputs
(list patatt))
(home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git")
--
2.41.0