From 684626763fa1fc66f4d7f7d909bf85a52d769b02 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 11 Mar 2019 19:01:49 +0100 Subject: gnu: emacs-magit: Fix perl path in dedicated variable. * gnu/packages/emacs-xyz.scm (emacs-magit)[arguments]: Do it. --- gnu/packages/emacs-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7807f97c45..b7e2167d53 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -278,7 +278,12 @@ on stdout instead of using a socket as the Emacsclient does.") ("magit-popup" ,emacs-magit-popup) ("with-editor" ,emacs-with-editor))) (arguments - `(#:test-target "test" + `(#:modules ((guix build gnu-build-system) + (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 #:make-flags @@ -317,8 +322,9 @@ on stdout instead of using a socket as the Emacsclient does.") 'build 'patch-exec-paths (lambda* (#:key inputs #:allow-other-keys) (let ((perl (assoc-ref inputs "perl"))) - (substitute* "lisp/magit-sequence.el" - (("perl") (string-append perl "/bin/perl"))) + (make-file-writable "lisp/magit-sequence.el") + (emacs-substitute-variables "lisp/magit-sequence.el" + ("magit-perl-executable" (string-append perl "/bin/perl"))) #t)))))) (home-page "https://magit.vc/") (synopsis "Emacs interface for the Git version control system") -- cgit v1.2.3