unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Tobias Geerinckx-Rice via Bug reports for GNU Guix <bug-guix@gnu.org>
To: 43418@debbugs.gnu.org
Subject: bug#43418: [PATCH] gnu: youtube-dl: Refer to ffmpeg.
Date: Wed, 16 Sep 2020 11:54:15 +0200	[thread overview]
Message-ID: <20200916095415.13617-1-me@tobias.gr> (raw)
In-Reply-To: <CAEEhgEtsM4BQ=5uu7VDC9afGubzs0Xg6jPYyH7g4A+xPTMRgzA@mail.gmail.com>

Addresses <https://issues.guix.gnu.org/43418>.

* gnu/packages/video.scm (youtube-dl)[inputs]: Add ffmpeg.
[arguments]: Fall back to input ffmpeg instead of searching $PATH.
---
 gnu/packages/video.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 8ebe7dbcdf..50f751f8da 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2184,6 +2184,13 @@ To load this plugin, specify the following option when starting mpv:
      ;; 'youtube-dl.bash-completion'.
      `(#:tests? #f ; Many tests fail. The test suite can be run with pytest.
        #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'default-to-the-ffmpeg-input
+                    (lambda _
+                      ;; Continue respecting the --ffmpeg-location argument.
+                      (substitute* "youtube_dl/postprocessor/ffmpeg.py"
+                        (("\\.get\\('ffmpeg_location'\\)" match)
+                         (format #f "~a or '~a'" match (which "ffmpeg"))))
+                      #t))
                   (add-before 'install 'fix-the-data-directories
                     (lambda* (#:key outputs #:allow-other-keys)
                       (let ((prefix (assoc-ref outputs "out")))
@@ -2207,6 +2214,8 @@ To load this plugin, specify the following option when starting mpv:
                         (copy-file "youtube-dl.zsh"
                                    (string-append zsh "/_youtube-dl"))
                         #t))))))
+    (inputs
+     `(("ffmpeg" ,ffmpeg)))
     (synopsis "Download videos from YouTube.com and other sites")
     (description
      "Youtube-dl is a small command-line program to download videos from
-- 
2.28.0





  parent reply	other threads:[~2020-09-16  9:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15 11:27 bug#43418: ffprobe/avprobe and ffmpeg/avconv should be added as dependencies of youtube-dl so it will function correctly Nathan Dehnel
2020-09-15 12:06 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2020-09-15 19:34   ` raingloom
2020-09-15 23:52     ` Nathan Dehnel
2020-09-15 23:17   ` Leo Famulari
2020-09-16  8:14     ` Mark H Weaver
2020-09-16  8:58       ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2020-09-16 11:30         ` Mark H Weaver
2020-09-16  9:54 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix [this message]
2020-09-16 11:31   ` bug#43418: [PATCH] gnu: youtube-dl: Refer to ffmpeg Mark H Weaver
2020-09-16 11:54     ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2020-09-16 12:07       ` zimoun

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=20200916095415.13617-1-me@tobias.gr \
    --to=bug-guix@gnu.org \
    --cc=43418@debbugs.gnu.org \
    --cc=me@tobias.gr \
    /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).