01/01: gnu: emacs-telega: Correct path coding for `ffmpeg`.

[guix-commits]

brettgilio pushed a commit to branch master
in repository guix.

commit e19a53938875cbe53a00daa0501846e53656d1af
Author: Brett Gilio <address@hidden>
Date:   Fri Dec 13 12:37:15 2019 -0600

    gnu: emacs-telega: Correct path coding for `ffmpeg`.
    
    * gnu/packages/emacs-xyz.scm (emacs-telega)[arguments]: Continuation of the
      previous patch. Adds a hard-coded path from NAME `ffmpeg-bin` to work 
around
      issue of ffmpeg not being found on the system PATH.
---
 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 86e0ad1..0480b1b 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20115,14 +20115,20 @@ fish-completion.  It can be used in both Eshell and 
M-x shell.")
                #t))
            (add-after 'unpack 'telega-paths-patch
              (lambda* (#:key inputs #:allow-other-keys)
-               ;; Hard-code path to `ffplay`.
+               ;; Hard-code paths to `ffplay` and `ffmpeg`.
                (let ((ffplay-bin (string-append (assoc-ref inputs "ffmpeg")
-                                                "/bin/ffplay")))
+                                                "/bin/ffplay"))
+                     (ffmpeg-bin (string-append (assoc-ref inputs "ffmpeg")
+                                                "/bin/ffmpeg")))
                  (substitute* "telega-ffplay.el"
                    (("\\(executable-find \"ffplay\"\\)")
                     (string-append
                      "(and (file-executable-p \"" ffplay-bin "\")"
-                     "\"" ffplay-bin "\")"))))
+                     "\"" ffplay-bin "\")"))
+                   (("\\(executable-find \"ffmpeg\"\\)")
+                    (string-append
+                     "(and (file-executable-p \"" ffmpeg-bin "\")"
+                     "\"" ffmpeg-bin "\")"))))
                ;; Modify telega-util to reflect unique dir name in
                ;; `telega-install-data' phase.
                (substitute* "telega-util.el"