GNU bug report logs -
#38590
[PATCH] gnu: emacs-telega: Don't propagate ffmpeg.
Previous Next
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38590 in the body.
You can then email your comments to 38590 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org
:
bug#38590
; Package
guix-patches
.
(Fri, 13 Dec 2019 13:07:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Leo Prikler <leo.prikler <at> student.tugraz.at>
:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org
.
(Fri, 13 Dec 2019 13:07:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* 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
Information forwarded
to
guix-patches <at> gnu.org
:
bug#38590
; Package
guix-patches
.
(Fri, 13 Dec 2019 14:30:03 GMT)
Full text and
rfc822 format available.
Message #8 received at 38590 <at> debbugs.gnu.org (full text, mbox):
Good changes, Leo. I will push these ASAP.
Dec 13, 2019 7:09:37 AM Leo Prikler <leo.prikler <at> 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(-)
>
> 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
>
Reply sent
to
Brett Gilio <brettg <at> posteo.net>
:
You have taken responsibility.
(Fri, 13 Dec 2019 18:09:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Leo Prikler <leo.prikler <at> student.tugraz.at>
:
bug acknowledged by developer.
(Fri, 13 Dec 2019 18:09:02 GMT)
Full text and
rfc822 format available.
Message #13 received at 38590-done <at> debbugs.gnu.org (full text, mbox):
Pushed with 5f12df7ea6dd8422aaf5b27f07b27897073a65bd.
I made some very small revisions.
Thanks!
--
Brett M. Gilio
Homepage -- https://scm.pw/
GNU Guix -- https://guix.gnu.org/
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org
.
(Sat, 11 Jan 2020 12:24:05 GMT)
Full text and
rfc822 format available.
This bug report was last modified 4 years and 100 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.