From: Thiago Jung Bauermann via Guix-patches via <guix-patches@gnu.org>
To: 59253@debbugs.gnu.org
Cc: Thiago Jung Bauermann <bauermann@kolabnow.com>,
liliana.prikler@gmail.com
Subject: [bug#59253] [PATCH] gnu: emacs-magit: Substitute git executable path.
Date: Sun, 13 Nov 2022 18:11:11 -0300 [thread overview]
Message-ID: <20221113211111.59581-1-bauermann@kolabnow.com> (raw)
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.
---
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 8ff6275bad96..1406f8a715f2 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 @@ (define-public emacs-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")))))
next reply other threads:[~2022-11-13 21:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-13 21:11 Thiago Jung Bauermann via Guix-patches via [this message]
2022-11-13 21:24 ` [bug#59253] [PATCH] gnu: emacs-magit: Substitute git executable path Liliana Marie Prikler
2022-11-13 21:55 ` bug#59253: " Liliana Marie Prikler
2022-11-13 22:21 ` [bug#59253] " Thiago Jung Bauermann via Guix-patches via
2022-11-14 3:01 ` Maxim Cournoyer
2022-11-14 3:09 ` Thiago Jung Bauermann via Guix-patches via
2022-11-15 0:52 ` Kyle Meyer
2022-11-15 4:30 ` Thiago Jung Bauermann via Guix-patches via
2022-11-15 13:49 ` Maxim Cournoyer
2022-11-15 8:52 ` zimoun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221113211111.59581-1-bauermann@kolabnow.com \
--to=guix-patches@gnu.org \
--cc=59253@debbugs.gnu.org \
--cc=bauermann@kolabnow.com \
--cc=liliana.prikler@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.