me
/
guix
Archived
1
0
Fork 0
Code

gnu: emacs-telega: Patch `ffplay` instead of propagating. 

* gnu/packages/emacs-xyz.scm (emacs-telega) [phases]:
<telega-data-patch>: Rename to telega-paths-patch.
<telega-paths-patch>: Substitute ffplay path for patching.
[propagated-inputs] <ffmpeg>: Remove.
[inputs] <ffmpeg>: Add.

Fixes: #38590 <https://bugs.gnu.org/38590>

Signed-off-by: Brett Gilio <brettg@posteo.net>
Co-authored-by: Brett Gilio <brettg@posteo.net>
master
Leo Prikler 2019-12-13 14:05:24 +01:00 committed by Brett Gilio
parent 085bdfd092
commit 5f12df7ea6
No known key found for this signature in database
GPG Key ID: 672243C4A03F0EEE
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/emacs-xyz.scm
View File

@ -20113,10 +20113,18 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(("python3 run_tests.py") (("python3 run_tests.py")
"")) ""))
#t)) #t))
(add-after 'unpack 'telega-paths-patch
(lambda* (#:key inputs #:allow-other-keys)
;; Hard-code path to `ffplay`.
(let ((ffplay-bin (string-append (assoc-ref inputs "ffmpeg")
"/bin/ffplay")))
(substitute* "telega-ffplay.el"
(("\\(executable-find \"ffplay\"\\)")
(string-append
"(and (file-executable-p \"" ffplay-bin "\")"
"\"" ffplay-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.
(add-after 'unpack 'telega-data-patch
(lambda _
(substitute* "telega-util.el" (substitute* "telega-util.el"
(("\\(concat \"etc/\" filename\\) telega--lib-directory") (("\\(concat \"etc/\" filename\\) telega--lib-directory")
"(concat \"telega-data/\" filename) "(concat \"telega-data/\" filename)
@ -20149,7 +20157,6 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(invoke "python3" "server/run_tests.py") (invoke "python3" "server/run_tests.py")
#t)) #t))
(delete 'configure) (delete 'configure)
;; Build emacs-side using `emacs-build-system' ;; Build emacs-side using `emacs-build-system'
(add-after 'compress-documentation 'emacs-add-source-to-load-path (add-after 'compress-documentation 'emacs-add-source-to-load-path
(assoc-ref emacs:%standard-phases 'add-source-to-load-path)) (assoc-ref emacs:%standard-phases 'add-source-to-load-path))
@ -20168,9 +20175,10 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(assoc-ref emacs:%standard-phases 'build)) (assoc-ref emacs:%standard-phases 'build))
(add-after 'emacs-build 'emacs-make-autoloads (add-after 'emacs-build 'emacs-make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads))))) (assoc-ref emacs:%standard-phases 'make-autoloads)))))
(inputs
`(("ffmpeg" ,ffmpeg))) ; mp4/gif support.
(propagated-inputs (propagated-inputs
`(("emacs-visual-fill-column" ,emacs-visual-fill-column) `(("emacs-visual-fill-column" ,emacs-visual-fill-column)
("ffmpeg" ,ffmpeg) ; mp4/gif support.
("libwebp" ,libwebp))) ; sticker support. ("libwebp" ,libwebp))) ; sticker support.
(native-inputs (native-inputs
`(("tdlib" ,tdlib) `(("tdlib" ,tdlib)