[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: yt-dlp: Only build with pandoc on supported
From: |
guix-commits |
Subject: |
branch master updated: gnu: yt-dlp: Only build with pandoc on supported systems. |
Date: |
Sun, 14 Aug 2022 10:09:56 -0400 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new d521ad06e0 gnu: yt-dlp: Only build with pandoc on supported systems.
d521ad06e0 is described below
commit d521ad06e0fa7743a25a37f92059e8d4f607a8d9
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Aug 14 16:55:20 2022 +0300
gnu: yt-dlp: Only build with pandoc on supported systems.
* gnu/packages/video.scm (yt-dlp)[arguments]: Adjust custom
'build-generated-files phase to adjust to the presence of pandoc.
[native-inputs]: Make explicit list. Only include pandoc on supported
systems.
---
gnu/packages/video.scm | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 1fec5da40d..0016877033 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2509,12 +2509,17 @@ YouTube.com and many more sites.")
(("\\.get_param\\('ffmpeg_location'\\)" match)
(format #f "~a or '~a'" match (which "ffmpeg"))))))
(replace 'build-generated-files
- (lambda _
- (invoke "make"
- "PYTHON=python"
- "yt-dlp"
- "yt-dlp.1"
- "completions")))
+ (lambda* (#:key inputs #:allow-other-keys)
+ (if (assoc-ref inputs "pandoc")
+ (invoke "make"
+ "PYTHON=python"
+ "yt-dlp"
+ "yt-dlp.1"
+ "completions")
+ (invoke "make"
+ "PYTHON=python"
+ "yt-dlp"
+ "completions"))))
(replace 'fix-the-data-directories
(lambda* (#:key outputs #:allow-other-keys)
(let ((prefix (assoc-ref outputs "out")))
@@ -2534,8 +2539,14 @@ YouTube.com and many more sites.")
python-mutagen
python-pycryptodomex
python-websockets)))
- (native-inputs (modify-inputs (package-native-inputs youtube-dl)
- (append pandoc python-pytest)))
+ (native-inputs
+ (append
+ ;; To generate the manpage.
+ (if (member (%current-system)
+ (package-transitive-supported-systems pandoc))
+ (list pandoc)
+ '())
+ (list python-pytest zip)))
(description
"yt-dlp is a small command-line program to download videos from
YouTube.com and many more sites. It is a fork of youtube-dl with a
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: yt-dlp: Only build with pandoc on supported systems.,
guix-commits <=