[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: magit: Fix rebase commands that require perl.
From: |
Alex Kost |
Subject: |
01/01: gnu: magit: Fix rebase commands that require perl. |
Date: |
Wed, 27 Jul 2016 08:19:45 +0000 (UTC) |
alezost pushed a commit to branch master
in repository guix.
commit 46bd451520d7a318e8b52a4a500d146403b8dcb8
Author: Alex Griffin <address@hidden>
Date: Tue Jul 26 13:29:51 2016 -0500
gnu: magit: Fix rebase commands that require perl.
* gnu/packages/emacs.scm (magit)[inputs]: Add 'perl'.
[arguments]: Adjust 'patch-exec-paths' phase to make some rebase
commands find 'perl'.
Signed-off-by: Alex Kost <address@hidden>
---
gnu/packages/emacs.scm | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8dd728b..61f906d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2016 Matthew Jordan <address@hidden>
;;; Copyright © 2016 Roel Janssen <address@hidden>
;;; Copyright © 2016 ng0 <address@hidden>
+;;; Copyright © 2016 Alex Griffin <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -454,7 +455,9 @@ on stdout instead of using a socket as the Emacsclient
does.")
(build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal)))
- (inputs `(("git" ,git)))
+ (inputs
+ `(("git" ,git)
+ ("perl" ,perl)))
(propagated-inputs
`(("dash" ,emacs-dash)
("with-editor" ,emacs-with-editor)))
@@ -487,9 +490,12 @@ on stdout instead of using a socket as the Emacsclient
does.")
(add-before
'build 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys)
- (let ((git (assoc-ref inputs "git")))
+ (let ((git (assoc-ref inputs "git"))
+ (perl (assoc-ref inputs "perl")))
(emacs-substitute-variables "lisp/magit-git.el"
("magit-git-executable" (string-append git "/bin/git")))
+ (substitute* "lisp/magit-sequence.el"
+ (("perl") (string-append perl "/bin/perl")))
#t))))))
(home-page "http://magit.github.io/")
(synopsis "Emacs interface for the Git version control system")