me/guix
Archived
1
0
Fork 0
Code Activity

gnu: emacs-telega: Correct path coding for ffmpeg.

Browse source 
* 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.
This commit is contained in:
Brett Gilio 2019-12-13 12:37:15 -06:00
parent 5f12df7ea6
commit e19a539388
No known key found for this signature in database
GPG key ID: 672243C4A03F0EEE
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/emacs-xyz.scm
View file

@ -20115,14 +20115,20 @@ fish-completion. It can be used in both Eshell and M-x shell.")
#t)) #t))
(add-after 'unpack 'telega-paths-patch (add-after 'unpack 'telega-paths-patch
(lambda* (#:key inputs #:allow-other-keys) (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") (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" (substitute* "telega-ffplay.el"
(("\\(executable-find \"ffplay\"\\)") (("\\(executable-find \"ffplay\"\\)")
(string-append (string-append
"(and (file-executable-p \"" ffplay-bin "\")" "(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 ;; Modify telega-util to reflect unique dir name in
;; `telega-install-data' phase. ;; `telega-install-data' phase.
(substitute* "telega-util.el" (substitute* "telega-util.el"