(address . guix-patches@gnu.org)
7aba2ddd3f21b0034c2d4c59d46383b8@riseup.net
From 354d66b2eba83f5e0ed1d7f55f6055d0be3f962e Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Sun, 6 Jan 2019 22:10:20 +0100
Subject: [PATCH 1/2] gnu: Separate youtube-viewer-cli from youtube-viewer.
* gnu/packages/video.scm (youtube-viewer-cli): New variable.
---
gnu/packages/video.scm | 62 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
Toggle diff (75 lines)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dfcfc121a..c6bd9063c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1521,6 +1521,68 @@ Both command-line and GTK2 interface are available.")
(home-page "https://github.com/trizen/youtube-viewer")
(license license:perl-license)))
+(define-public youtube-viewer-cli
+ (package
+ (name "youtube-viewer-cli")
+ (version "3.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/trizen/youtube-viewer.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0axgb95lx81psgrb2a5rfdd8gl4mhsrzf41jas6l58d1xkaj54ri"))))
+ (build-system perl-build-system)
+ (native-inputs
+ `(("perl-module-build" ,perl-module-build)))
+ ;; FIXME: Add optional dependencies once available:
+ ;; perl-lwp-useragent-cached
+ (inputs
+ `(("perl-data-dump" ,perl-data-dump)
+ ("perl-file-sharedir" ,perl-file-sharedir)
+ ("perl-json" ,perl-json)
+ ("perl-libwww" ,perl-libwww)
+ ("perl-lwp-protocol-https" ,perl-lwp-protocol-https)
+ ;; The LWP::UserAgent::Cache module is recommended
+ ("perl-mozilla-ca" ,perl-mozilla-ca)
+ ;; ("perl-term-readline-gnu" ,perl-term-readline-gnu) not in guix yet
+ ("perl-unicode-linebreak" ,perl-unicode-linebreak)))
+ (arguments
+ `(#:modules ((guix build perl-build-system)
+ (guix build utils)
+ (srfi srfi-26))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/"))
+ (site-dir (string-append out "/lib/perl5/site_perl/"))
+ (lib-path (getenv "PERL5LIB")))
+ (for-each (cut wrap-program <>
+ `("PERL5LIB" ":" prefix (,lib-path ,site-dir)))
+ (find-files bin-dir))
+ #t)))
+ (add-after 'wrap-program 'rename
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/")))
+ (chdir bin-dir)
+ (rename-file "youtube-viewer"
+ "youtube-viewer-cli")))))))
+ (synopsis
+ "CLI application for searching and streaming videos from YouTube")
+ (description
+ "Youtube-viewer-cli searches and plays YouTube videos from the command line.
+It comes with various search options; it can search for videos, playlists
+and/or channels. The videos are streamed directly in a selected video player
+at the best resolution (customizable) and with closed-captions (if available).
+GTK2 interface is available in @package{youtube-viewer-gtk}.")
+ (home-page "https://github.com/trizen/youtube-viewer")
+ (license license:perl-license)))
+
(define-public libbluray
(package
(name "libbluray")
--
2.19.2
From cc52eb5b8010d2bd9d9387e8a763948ac95d0d0b Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Sun, 6 Jan 2019 22:23:29 +0100
Subject: [PATCH 2/2] gnu: youtube-viewer: Rename to youtube-viewer-gtk
* gnu/packages/video.scm (youtube-viewer):
[name] Rename it.
[arguments] Add phase to rename the binary.
---
gnu/packages/video.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
Toggle diff (35 lines)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c6bd9063c..76ad48d19 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1466,9 +1466,9 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(home-page "https://you-get.org/")
(license license:expat)))
-(define-public youtube-viewer
+(define-public youtube-viewer-gtk
(package
- (name "youtube-viewer")
+ (name "youtube-viewer-gtk")
(version "3.5.0")
(source (origin
(method git-fetch)
@@ -1509,7 +1509,15 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(for-each (cut wrap-program <>
`("PERL5LIB" ":" prefix (,lib-path ,site-dir)))
(find-files bin-dir))
- #t))))))
+ #t)))
+ (add-after 'wrap-program 'rename
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/")))
+ (chdir bin-dir)
+ (rename-file "gtk-youtube-viewer"
+ "youtube-viewer-gtk")
+ #t))))))))
(synopsis
"Lightweight application for searching and streaming videos from YouTube")
(description
--
2.19.2