summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Griffin <a@ajgrf.com>2016-07-26 13:29:51 -0500
committerAlex Kost <alezost@gmail.com>2016-07-27 11:15:45 +0300
commit46bd451520d7a318e8b52a4a500d146403b8dcb8 (patch)
tree08b232d97f2478b859443ba84afb455da69beb9a
parent82ee141babe388071b8d2de2c5bebc950f702279 (diff)
downloadpatches-46bd451520d7a318e8b52a4a500d146403b8dcb8.tar
patches-46bd451520d7a318e8b52a4a500d146403b8dcb8.tar.gz
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 <alezost@gmail.com>
-rw-r--r--gnu/packages/emacs.scm10
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 8dd728b378..61f906d04f 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;;
;;; 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")