[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: gnu: yt-dlp: Fix substitution for ffmpeg path.
From: |
guix-commits |
Subject: |
06/09: gnu: yt-dlp: Fix substitution for ffmpeg path. |
Date: |
Thu, 25 May 2023 06:52:52 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 1af79a0615094ba0d86f4c5580481ed8cd181cd9
Author: Dominik Delgado Steuter <dds@disroot.org>
AuthorDate: Sat May 20 15:49:13 2023 +0200
gnu: yt-dlp: Fix substitution for ffmpeg path.
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.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/packages/video.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 40133bfbd4..ab19c2dd8c 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,10 +2571,13 @@ YouTube.com and many more sites.")
#~(modify-phases #$phases
;; See the comment for the corresponding phase in youtube-dl.
(replace 'default-to-the-ffmpeg-input
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(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 = '"
+ (dirname (search-input-file inputs "bin/ffmpeg"))
+ "'\n")))))
(replace 'build-generated-files
(lambda* (#:key inputs #:allow-other-keys)
(if (assoc-ref inputs "pandoc")
- branch master updated (0b0c2ef638 -> a9cde26133), guix-commits, 2023/05/25
- 02/09: guix-install.sh: Install SELinux policy and relabel file systems if needed., guix-commits, 2023/05/25
- 01/09: etc: SELinux: Update policy file., guix-commits, 2023/05/25
- 03/09: doc: Tweak SELinux instructions., guix-commits, 2023/05/25
- 04/09: self: Install 'guix-daemon.cil'., guix-commits, 2023/05/25
- 05/09: gnu: encfs: Depend on OpenSSL v1.1 to fix test segfault., guix-commits, 2023/05/25
- 06/09: gnu: yt-dlp: Fix substitution for ffmpeg path.,
guix-commits <=
- 08/09: gnu: tinyproxy: Update to 1.11.1., guix-commits, 2023/05/25
- 09/09: gnu: Add mouseloupe., guix-commits, 2023/05/25
- 07/09: gnu: Add dialect., guix-commits, 2023/05/25