branch master updated: gnu: emacs-flycheck-grammalecte: Fix location for external executables.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 3b1886c  gnu: emacs-flycheck-grammalecte: Fix location for external 
executables.
3b1886c is described below

commit 3b1886c9dd6941d753f6f2f17a30ec3ea69fc47e
Author: Nicolas Goaziou <address@hidden>
AuthorDate: Sun Mar 29 15:14:13 2020 +0200

    gnu: emacs-flycheck-grammalecte: Fix location for external executables.
    
    * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte)[inputs]: Add curl.
    [arguments]: Fix path to all "python", "python3" and "curl" occurrences.
---
 gnu/packages/emacs-xyz.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9d40b80..9199e56 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3381,13 +3381,16 @@ for Flow files.")
      `(#:include '("\\.(el|py)$")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'fix-python
-           ;; Hardcode python3 executable in the Emacs library.
+         (add-after 'unpack 'set-external-executables
+           ;; Hardcode python3 and curl executables in the Emacs library.
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((python3 (string-append (assoc-ref inputs "python")
-                                           "/bin/python3")))
+                                           "/bin/python3"))
+                   (curl (string-append (assoc-ref inputs "curl")
+                                        "/bin/curl")))
                (substitute* "flycheck-grammalecte.el"
-                 (("python3") python3))
+                 (("\"python3?") (string-append "\"" python3))
+                 (("\"curl") (string-append "\"" curl)))
                #t)))
          (add-after 'install 'link-to-grammalecte
            ;; The package expects grammalecte to be in a sub-directory.
@@ -3404,7 +3407,8 @@ for Flow files.")
                           "grammalecte"))
                #t))))))
     (inputs
-     `(("grammalecte" ,grammalecte)
+     `(("curl" ,curl)
+       ("grammalecte" ,grammalecte)
        ("python" ,python)))
     (propagated-inputs
      `(("emacs-flycheck" ,emacs-flycheck)))