03/03: gnu: emacs-magit: Substitute git executable path.

[guix-commits]

lilyp pushed a commit to branch master
in repository guix.

commit b59b033af3957e0de9a44733e26cbcc7114a4dfb
Author: Thiago Jung Bauermann <bauermann@kolabnow.com>
AuthorDate: Sun Nov 13 18:11:11 2022 -0300

    gnu: emacs-magit: Substitute git executable path.
    
    Magit has a strong dependency on Git so it should directly reference the
    git executable rather than expect it to be available in the profile or
    environment.
    
    This also fixes a build failure in emacs-forge.
    
    * gnu/packages/emacs-xyz.scm (emacs-magit)[arguments]<#:phases>: Substitute
    git path in the ‘magit-git-executable’ variable.
    
    Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/emacs-xyz.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8ff6275bad..1406f8a715 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -117,6 +117,7 @@
 ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
 ;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
 ;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
+;;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1031,7 +1032,11 @@ libgit2 bindings for Emacs, intended to boost the 
performance of Magit.")
                   ("magit-version" #$version))))
             (add-after 'set-magit-version 'patch-exec-paths
               (lambda* (#:key inputs #:allow-other-keys)
-                (make-file-writable "lisp/magit-sequence.el")
+                (for-each make-file-writable
+                          (list "lisp/magit-git.el" "lisp/magit-sequence.el"))
+                (emacs-substitute-variables "lisp/magit-git.el"
+                  ("magit-git-executable"
+                   (search-input-file inputs "/bin/git")))
                 (emacs-substitute-variables "lisp/magit-sequence.el"
                   ("magit-perl-executable"
                    (search-input-file inputs "/bin/perl")))))