branch master updated: gnu: youtube-dl: Refer to ffmpeg.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 7194b63  gnu: youtube-dl: Refer to ffmpeg.
7194b63 is described below

commit 7194b63833f3cbcd29a65bae0ecd6876cdb1f197
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Wed Sep 16 11:53:05 2020 +0200

    gnu: youtube-dl: Refer to ffmpeg.
    
    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 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 8ebe7db..7860462 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2184,6 +2184,16 @@ 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 _
+                      ;; See <https://issues.guix.gnu.org/43418#5>.
+                      ;; ffmpeg is big but required to request free formats
+                      ;; from, e.g., YouTube so pull it in unconditionally.
+                      ;; 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 +2217,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