From patchwork Wed Apr 1 13:01:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 21031 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C80D727BBE4; Wed, 1 Apr 2020 14:03:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9B2F827BBE1 for ; Wed, 1 Apr 2020 14:03:17 +0100 (BST) Received: from localhost ([::1]:60098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJd1Z-0000HE-3c for patchwork@mira.cbaines.net; Wed, 01 Apr 2020 09:03:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33343) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJd1K-0000Gp-UA for guix-patches@gnu.org; Wed, 01 Apr 2020 09:03:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJd1J-00048l-PR for guix-patches@gnu.org; Wed, 01 Apr 2020 09:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54250) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jJd1J-00048f-LV for guix-patches@gnu.org; Wed, 01 Apr 2020 09:03:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jJd1J-0007vx-I1 for guix-patches@gnu.org; Wed, 01 Apr 2020 09:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40060] [PATCH v3] gnu: youtube-dl: Add 'ffmpeg' as input. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Apr 2020 13:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40060 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40060@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158574612430326 (code B ref -1); Wed, 01 Apr 2020 13:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Apr 2020 13:02:04 +0000 Received: from localhost ([127.0.0.1]:37563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jJd0O-0007t3-60 for submit@debbugs.gnu.org; Wed, 01 Apr 2020 09:02:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:45398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jJd0M-0007sh-5R for submit@debbugs.gnu.org; Wed, 01 Apr 2020 09:02:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33212) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jJd0K-00005b-Ve for guix-patches@gnu.org; Wed, 01 Apr 2020 09:02:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jJd0J-00032J-H1 for guix-patches@gnu.org; Wed, 01 Apr 2020 09:02:00 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:38373) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jJd0J-00031W-AE for guix-patches@gnu.org; Wed, 01 Apr 2020 09:01:59 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 8E8C240010 for ; Wed, 1 Apr 2020 13:01:56 +0000 (UTC) From: Brice Waegeneire Date: Wed, 1 Apr 2020 15:01:52 +0200 Message-Id: <20200401130152.1871-1-brice@waegenei.re> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200314143418.13963-1-brice@waegenei.re> References: <20200314143418.13963-1-brice@waegenei.re> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/video.scm (youtube-dl)[arguments]: Add phase wrap-executable. [inputs]: Add ffmpeg. --- This version is rebased on top of master and the commit adding zsh completion has been removed from the patch set since it has already been merged. gnu/packages/video.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 03796fd770..6ad46fb9fe 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1680,7 +1680,17 @@ To load this plugin, specify the following option when starting mpv: (mkdir-p zsh) (copy-file "youtube-dl.zsh" (string-append zsh "/_youtube-dl")) - #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