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

gnu: magit: Do not set 'magit-git-executable' to absolute file name. 

Fixes <https://bugs.gnu.org/30434>.
Reported by Ricardo Wurmus <rekado@elephly.net>.

* gnu/packages/emacs.scm (magit)[arguments]: Do not modify the default value
of 'magit-git-executable'.  Remove "#:modules" and "#:imported-modules".
This commit is contained in:
Mark H Weaver 2018-02-14 03:25:38 -05:00
parent 02843215d8
commit 84fe44201b
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/emacs.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
@ -450,13 +450,7 @@ on stdout instead of using a socket as the Emacsclient does.")
;; XXX Add 'magit-popup' dependency for the next release (after 2.11.0). ;; XXX Add 'magit-popup' dependency for the next release (after 2.11.0).
("with-editor" ,emacs-with-editor))) ("with-editor" ,emacs-with-editor)))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:test-target "test"
(guix build utils)
(guix build emacs-utils))
#:imported-modules (,@%gnu-build-system-modules
(guix build emacs-utils))
#:test-target "test"
#:tests? #f ; tests are not included in the release #:tests? #f ; tests are not included in the release
#:make-flags #:make-flags
@ -478,10 +472,7 @@ 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 ((perl (assoc-ref inputs "perl")))
(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" (substitute* "lisp/magit-sequence.el"
(("perl") (string-append perl "/bin/perl"))) (("perl") (string-append perl "/bin/perl")))
#t)))))) #t))))))