From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: Dominik Delgado Steuter <dds@disroot.org>, 63117@debbugs.gnu.org
Cc: jackhill@jackhill.us
Subject: [bug#63117] [PATCH] gnu: yt-dlp: Fix substitution for ffmpeg path.
Date: Sat, 06 May 2023 06:23:41 +0200 [thread overview]
Message-ID: <7de4e6cf2831ed22b29da144e85e4aca661ae2bb.camel@gmail.com> (raw)
In-Reply-To: <20230505195053.1752-1-dds@disroot.org>
Am Freitag, dem 05.05.2023 um 21:50 +0200 schrieb Dominik Delgado
Steuter:
> 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(-)
>
> 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 <chadwainholness@gmail.com>
> ;;; Copyright © 2022 Andy Tai <atai@atai.org>
> ;;; Copyright © 2023 Ott Joon <oj@vern.cc>
> +;;; Copyright © 2023 Dominik Delgado Steuter <dds@disroot.org>
> ;;;
> ;;; 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")))))
The proper expression would be
(dirname (search-input-file inputs "bin/ffmpeg"))
You also need to make the (lambda _ ...) into a
(lambda* (#:key inputs #:allow-other-keys) ...)
> (replace 'build-generated-files
> (lambda* (#:key inputs #:allow-other-keys)
> (if (assoc-ref inputs "pandoc")
>
> base-commit: 6922069bcbe5c08da09c00e5aad44e390ebd1cc7
Cheers
next prev parent reply other threads:[~2023-05-06 4:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 14:32 [bug#63117] [PATCH] gnu: yt-dlp: Change input Dominik Delgado Steuter via Guix-patches via
2023-04-29 4:36 ` Jack Hill
2023-05-01 22:39 ` Dominik Delgado Steuter via Guix-patches via
2023-05-05 19:50 ` [bug#63117] [PATCH] gnu: yt-dlp: Fix substitution for ffmpeg path Dominik Delgado Steuter via Guix-patches via
2023-05-06 4:23 ` Liliana Marie Prikler [this message]
2023-05-20 13:49 ` Dominik Delgado Steuter via Guix-patches via
2023-05-25 10:42 ` bug#63117: [PATCH] gnu: yt-dlp: Change input Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7de4e6cf2831ed22b29da144e85e4aca661ae2bb.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=63117@debbugs.gnu.org \
--cc=dds@disroot.org \
--cc=jackhill@jackhill.us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).