nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Alex Griffin 2016-07-26 13:29:51 -05:00 committed by Alex Kost
parent 82ee141bab
commit 46bd451520
No known key found for this signature in database
GPG Key ID: 82460C082A0EE98F
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/emacs.scm
View File

@ -13,6 +13,7 @@
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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) (build-system gnu-build-system)
(native-inputs `(("texinfo" ,texinfo) (native-inputs `(("texinfo" ,texinfo)
("emacs" ,emacs-minimal))) ("emacs" ,emacs-minimal)))
(inputs `(("git" ,git))) (inputs
`(("git" ,git)
("perl" ,perl)))
(propagated-inputs (propagated-inputs
`(("dash" ,emacs-dash) `(("dash" ,emacs-dash)
("with-editor" ,emacs-with-editor))) ("with-editor" ,emacs-with-editor)))
@ -487,9 +490,12 @@ on stdout instead of using a socket as the Emacsclient does.")
(add-before (add-before
'build 'patch-exec-paths 'build 'patch-exec-paths
(lambda* (#:key inputs #:allow-other-keys) (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" (emacs-substitute-variables "lisp/magit-git.el"
("magit-git-executable" (string-append git "/bin/git"))) ("magit-git-executable" (string-append git "/bin/git")))
(substitute* "lisp/magit-sequence.el"
(("perl") (string-append perl "/bin/perl")))
#t)))))) #t))))))
(home-page "http://magit.github.io/") (home-page "http://magit.github.io/")
(synopsis "Emacs interface for the Git version control system") (synopsis "Emacs interface for the Git version control system")