me/guix
Archived
1
0
Fork 0
Code Activity

gnu: emacs-magit: Substitute git executable path.

Browse source 
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>
This commit is contained in:
Thiago Jung Bauermann 2022-11-13 18:11:11 -03:00 • committed by Liliana Marie Prikler
parent 7565aecf7a
commit b59b033af3
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnu/packages/emacs-xyz.scm
View file

@ -117,6 +117,7 @@
;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com> ;;; Copyright © 2022 Jose G Perez Taveras <josegpt27@gmail.com>
;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2022 Hilton Chain <hako@ultrarare.space>
;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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)))) ("magit-version" #$version))))
(add-after 'set-magit-version 'patch-exec-paths (add-after 'set-magit-version 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys) (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" (emacs-substitute-variables "lisp/magit-sequence.el"
("magit-perl-executable" ("magit-perl-executable"
(search-input-file inputs "/bin/perl"))))) (search-input-file inputs "/bin/perl")))))