From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:47686) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGQgF-0001fy-TO for guix-patches@gnu.org; Mon, 23 Mar 2020 13:16:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGQgE-0007tV-RW for guix-patches@gnu.org; Mon, 23 Mar 2020 13:16:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47491) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGQgE-0007tM-Np for guix-patches@gnu.org; Mon, 23 Mar 2020 13:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jGQgE-0001Ek-JO for guix-patches@gnu.org; Mon, 23 Mar 2020 13:16:02 -0400 Subject: [bug#40060] [PATCH v2 1/2] gnu: youtube-dl: Add 'ffmpeg' as input. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:47470) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGQfS-0000ia-SI for guix-patches@gnu.org; Mon, 23 Mar 2020 13:15:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGQfR-0007RR-Js for guix-patches@gnu.org; Mon, 23 Mar 2020 13:15:14 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:46159) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGQfR-0007OI-DL for guix-patches@gnu.org; Mon, 23 Mar 2020 13:15:13 -0400 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 1D5151BF20E for ; Mon, 23 Mar 2020 17:15:10 +0000 (UTC) From: Brice Waegeneire Date: Mon, 23 Mar 2020 18:15:01 +0100 Message-Id: <20200323171502.3147-2-brice@waegenei.re> In-Reply-To: <20200323171502.3147-1-brice@waegenei.re> References: <20200314143418.13963-1-brice@waegenei.re> <20200323171502.3147-1-brice@waegenei.re> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40060@debbugs.gnu.org * gnu/packages/video.scm (youtube-dl)[arguments]: Add phase wrap-executable. [inputs]: Add ffmpeg. --- gnu/packages/video.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 38e9d36307..3b64c435b7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Josh Holland +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1671,7 +1672,17 @@ To load this plugin, specify the following option when starting mpv: (string-append "'" prefix "/etc/")) (("'share/") (string-append "'" prefix "/share/"))) - #t)))))) + #t))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ffmpeg (assoc-ref inputs "ffmpeg"))) + (wrap-program (string-append out "/bin/youtube-dl") + `("PATH" ":" prefix + ,(list (string-append ffmpeg "/bin"))))) + #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.25.1