From: Leo Prikler <leo.prikler@student.tugraz.at>
To: 38590@debbugs.gnu.org
Subject: [bug#38590] [PATCH] gnu: emacs-telega: Don't propagate ffmpeg.
Date: Fri, 13 Dec 2019 14:05:24 +0100 [thread overview]
Message-ID: <20191213130524.14180-1-leo.prikler@student.tugraz.at> (raw)
* gnu/packages/emacs-xyz.scm (emacs-telega) [phases]:
<telega-data-patch>: Rename to telega-paths-patch.
<telega-paths-patch>: Substitute ffplay path.
[propagated-inputs] <ffmpeg>: Move from here ...
[inputs] <ffmpeg>: ... to here.
---
gnu/packages/emacs-xyz.scm | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ae7e7a64cc..bc36b5dbce 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20113,10 +20113,18 @@ fish-completion. It can be used in both Eshell and M-x shell.")
(("python3 run_tests.py")
""))
#t))
- ;; Modify telega-util to reflect unique dir name in
- ;; `telega-install-data' phase.
- (add-after 'unpack 'telega-data-patch
- (lambda _
+ (add-after 'unpack 'telega-paths-patch
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Hardcode `ffplay path.
+ (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
+ ;; `telega-install-data' phase.
(substitute* "telega-util.el"
(("\\(concat \"etc/\" filename\\) telega--lib-directory")
"(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")
#t))
(delete 'configure)
-
;; Build emacs-side using `emacs-build-system'
(add-after 'compress-documentation 'emacs-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))
(add-after 'emacs-build 'emacs-make-autoloads
(assoc-ref emacs:%standard-phases 'make-autoloads)))))
+ (inputs
+ `(("ffmpeg" ,ffmpeg))) ; mp4/gif support.
(propagated-inputs
`(("emacs-visual-fill-column" ,emacs-visual-fill-column)
- ("ffmpeg" ,ffmpeg) ; mp4/gif support.
("libwebp" ,libwebp))) ; sticker support.
(native-inputs
`(("tdlib" ,tdlib)
--
2.24.1
next reply other threads:[~2019-12-13 13:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 13:05 Leo Prikler [this message]
2019-12-13 14:29 ` [bug#38590] [PATCH] gnu: emacs-telega: Don't propagate ffmpeg Brett Gilio
2019-12-13 18:07 ` bug#38590: " Brett Gilio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213130524.14180-1-leo.prikler@student.tugraz.at \
--to=leo.prikler@student.tugraz.at \
--cc=38590@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).