From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GDBVIWbhYV9obwAA0tVLHw (envelope-from ) for ; Wed, 16 Sep 2020 09:56:54 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id uEFDHWbhYV93UQAAB5/wlQ (envelope-from ) for ; Wed, 16 Sep 2020 09:56:54 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 81666940142 for ; Wed, 16 Sep 2020 09:56:53 +0000 (UTC) Received: from localhost ([::1]:34628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIUBH-0004bw-DV for larch@yhetil.org; Wed, 16 Sep 2020 05:56:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIU9W-00021v-Vj for bug-guix@gnu.org; Wed, 16 Sep 2020 05:55:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIU9W-0000qQ-Gj for bug-guix@gnu.org; Wed, 16 Sep 2020 05:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kIU9W-0007Wx-Fi for bug-guix@gnu.org; Wed, 16 Sep 2020 05:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#43418: [PATCH] gnu: youtube-dl: Refer to ffmpeg. References: In-Reply-To: Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 16 Sep 2020 09:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43418 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 43418@debbugs.gnu.org Received: via spool by 43418-submit@debbugs.gnu.org id=B43418.160025005528889 (code B ref 43418); Wed, 16 Sep 2020 09:55:02 +0000 Received: (at 43418) by debbugs.gnu.org; 16 Sep 2020 09:54:15 +0000 Received: from localhost ([127.0.0.1]:33248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIU8l-0007Vt-Ee for submit@debbugs.gnu.org; Wed, 16 Sep 2020 05:54:15 -0400 Received: from tobias.gr ([80.241.217.52]:47192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kIU8i-0007Vj-TA for 43418@debbugs.gnu.org; Wed, 16 Sep 2020 05:54:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=rSjpXJ9QIjjW62VPfJUQRe5IQKCe8clWisfZ6+IaNr8=; h=date:subject:to: from; b=AlBiOcLvKzO5/P0u4p53rNtYH3FRUuZW0aYtwhSRsmqwMNDQmtO7eX3S0uxHQm 20vl9Yf198F+TgKRIaCpBh5gvipEIvnNWYB3fmoTnjGlekNnVfk3SbJL0nFjDEDFO4J9+F hAEMZTyxEqrnNIDbXPHz6KbGcSAlElr8lBRtIUu4Co1accr3v9jN6y20lkfMYmy8BYme0O UG/swIP/GyJxrTvCbyXMVkAF4rH1aepsGhK8nmDwy2f6slmCVMNWpgRXf8GeOghzwuekUw 2NzLzbl6EQxKDl0p+CFjI42KQvdk9v3oPg5bsI9rnfg3g4GRKaDplPV3OvNyi1sUteUigQ == Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 723a5a5d (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO) for <43418@debbugs.gnu.org>; Wed, 16 Sep 2020 09:54:11 +0000 (UTC) Date: Wed, 16 Sep 2020 11:54:15 +0200 Message-Id: <20200916095415.13617-1-me@tobias.gr> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: Tobias Geerinckx-Rice From: Tobias Geerinckx-Rice via Bug reports for GNU Guix X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=tobias.gr header.s=2018 header.b=AlBiOcLv; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: 4DHkrbfqNHX0 Addresses . * 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