[PATCH] gnu: emacs-telega: Don't propagate ffmpeg.

  • Done
  • quality assurance status badge
Details
2 participants
  • Brett Gilio
  • Leo Prikler
Owner
unassigned
Submitted by
Leo Prikler
Severity
normal

Debbugs page

Leo Prikler wrote 5 years ago
(address . guix-patches@gnu.org)
20191213130524.14180-1-leo.prikler@student.tugraz.at
* 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(-)

Toggle diff (49 lines)
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
Brett Gilio wrote 5 years ago
(name . Leo Prikler)(address . leo.prikler@student.tugraz.at)(address . 38590@debbugs.gnu.org)
74430c1e-d0bf-4800-9341-7088344dacfb@localhost
Good changes, Leo. I will push these ASAP.

Dec 13, 2019 7:09:37 AM Leo Prikler <leo.prikler@student.tugraz.at>:

Toggle quote (59 lines)
> * 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
>
Brett Gilio wrote 5 years ago
(name . Leo Prikler)(address . leo.prikler@student.tugraz.at)(address . 38590-done@debbugs.gnu.org)
87blscp096.fsf@posteo.net
Pushed with 5f12df7ea6dd8422aaf5b27f07b27897073a65bd.

I made some very small revisions.

Thanks!
--
Brett M. Gilio
Homepage -- https://scm.pw/
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 38590@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 38590
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help