From patchwork Fri May 5 19:50:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dominik Delgado Steuter X-Patchwork-Id: 49824 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 0301E27BBE2; Sat, 6 May 2023 02:03:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9AD1F27BBE9 for ; Sat, 6 May 2023 02:02:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pv6Jz-0008Ac-TS; Fri, 05 May 2023 21:02:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pv6AZ-0006fJ-JF for guix-patches@gnu.org; Fri, 05 May 2023 20:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pv6AY-0002N0-Hf for guix-patches@gnu.org; Fri, 05 May 2023 20:53:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pv6AY-0006Th-97; Fri, 05 May 2023 20:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63117] [PATCH] gnu: yt-dlp: Fix substitution for ffmpeg path. References: <20230427143200.13000-1-d@delgado.nrw> In-Reply-To: <20230427143200.13000-1-d@delgado.nrw> Resent-From: Dominik Delgado Steuter Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Sat, 06 May 2023 00:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63117 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63117@debbugs.gnu.org Cc: Dominik Delgado Steuter , jackhill@jackhill.us, lars@6xq.net X-Debbugs-Original-Xcc: lars@6xq.net Received: via spool by 63117-submit@debbugs.gnu.org id=B63117.168333432424818 (code B ref 63117); Sat, 06 May 2023 00:53:02 +0000 Received: (at 63117) by debbugs.gnu.org; 6 May 2023 00:52:04 +0000 Received: from localhost ([127.0.0.1]:57827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pv69a-0006Ry-8e for submit@debbugs.gnu.org; Fri, 05 May 2023 20:52:04 -0400 Received: from knopi.disroot.org ([178.21.23.139]:51676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pv1SO-0005Yb-UV for 63117@debbugs.gnu.org; Fri, 05 May 2023 15:51:09 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 38BF2402DC; Fri, 5 May 2023 21:51:08 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wHF7bJwjIG0g; Fri, 5 May 2023 21:51:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1683316267; bh=mqteeTX9HUf+GM8ZuA3W56up7ZdHgkFgaQcKvEj850I=; h=From:To:Cc:Subject:Date; b=DgTDepAh1sC1NPVXAa0cGm3NlN+t1hAp4AwH9+SljJnus7W7k7WK4Hwnh9ZtQIDsW n/75u8Mn5Sof4wmocHof8OanQWXHyWmDKYV0V5ExOFEKyW4xhW4fJEgQrTJYjXTFo8 2D1M9myPWMnFjZejnhatUVr6fZPDHgbwndoFS/j/WCGXxN/qEzVyr8ksqYKiIJy3vv 9NtBaovketaNczAyspWIBi4IcbVb7CtWtfMrPTX7lLsIv4tmMi/6G8Ijmm7UUUSuFj D/m1hvwTLqIuILoxe8M0QsCzWX9lpXE1cMfkUe0GE2N2sHnOqT0nE5jio2mp161Pxq J4/mIMjjw+ryg== Date: Fri, 5 May 2023 21:50:53 +0200 Message-Id: <20230505195053.1752-1-dds@disroot.org> MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 05 May 2023 20:51:59 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Fri, 05 May 2023 21:02:46 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Dominik Delgado Steuter X-ACL-Warn: , Dominik Delgado Steuter via Guix-patches X-Patchwork-Original-From: Dominik Delgado Steuter via Guix-patches via From: Dominik Delgado Steuter Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The old expression did not work; ffmpeg was not found when using the --add-metadata flag. * gnu/packages/video.scm (yt-dlp) [arguments]: Adjust substitution in custom 'default-to-the-ffmpeg-input phase. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: 6922069bcbe5c08da09c00e5aad44e390ebd1cc7 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 65fd92e..1301b79 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2022 Chadwain Holness ;;; Copyright © 2022 Andy Tai ;;; Copyright © 2023 Ott Joon +;;; Copyright © 2023 Dominik Delgado Steuter ;;; ;;; This file is part of GNU Guix. ;;; @@ -2570,8 +2571,8 @@ (define-public yt-dlp (replace 'default-to-the-ffmpeg-input (lambda _ (substitute* "yt_dlp/postprocessor/ffmpeg.py" - (("\\.get_param\\('ffmpeg_location'\\)" match) - (format #f "~a or '~a'" match (which "ffmpeg")))))) + (("location = self.get_param(.*)$") + (string-append "location = '" #$ffmpeg "/bin'\n"))))) (replace 'build-generated-files (lambda* (#:key inputs #:allow-other-keys) (if (assoc-ref inputs "pandoc")