mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-02-01 15:26:47 +01:00
gnu: video: Add 'bash' input for 'wrap-program'.
It is required for cross-compilation. * gnu/packages/video.scm (pipe-viewer)[inputs]: Add 'bash-minimal'. (vlc): Remove trailing #t. (youtube-viewer)[inputs]: Likewise. (openshot)[inputs]: Likewise. (gaupol)[inputs]: Likewise. (get-iplayer)[inputs]: Likewise. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I572eddc1084e1397b06d1fa264ec575c8c9b5340
This commit is contained in:
parent
94e7684004
commit
c209f4db0a
1 changed files with 19 additions and 19 deletions
|
@ -1260,7 +1260,8 @@ (define-public pipe-viewer
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list perl-module-build perl-test-pod perl-test-simple))
|
(list perl-module-build perl-test-pod perl-test-simple))
|
||||||
(inputs
|
(inputs
|
||||||
(list perl-data-dump
|
(list bash-minimal
|
||||||
|
perl-data-dump
|
||||||
perl-digest-md5
|
perl-digest-md5
|
||||||
perl-encode
|
perl-encode
|
||||||
ffmpeg
|
ffmpeg
|
||||||
|
@ -2483,8 +2484,7 @@ (define-public vlc
|
||||||
;; Some of the tests require using the display to test out VLC,
|
;; Some of the tests require using the display to test out VLC,
|
||||||
;; which fails in our sandboxed build system
|
;; which fails in our sandboxed build system
|
||||||
(substitute* "test/run_vlc.sh"
|
(substitute* "test/run_vlc.sh"
|
||||||
(("./vlc --ignore-config") "echo"))
|
(("./vlc --ignore-config") "echo")))))
|
||||||
#t)))
|
|
||||||
(add-after 'strip 'regenerate-plugin-cache
|
(add-after 'strip 'regenerate-plugin-cache
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
;; The 'install-exec-hook' rule in the top-level Makefile.am
|
;; The 'install-exec-hook' rule in the top-level Makefile.am
|
||||||
|
@ -2510,8 +2510,7 @@ (define-public vlc
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(let ((out (assoc-ref outputs "out"))
|
||||||
(plugin-path (getenv "QT_PLUGIN_PATH")))
|
(plugin-path (getenv "QT_PLUGIN_PATH")))
|
||||||
(wrap-program (string-append out "/bin/vlc")
|
(wrap-program (string-append out "/bin/vlc")
|
||||||
`("QT_PLUGIN_PATH" ":" prefix (,plugin-path))))
|
`("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))))))))
|
||||||
#t)))))
|
|
||||||
(home-page "https://www.videolan.org/")
|
(home-page "https://www.videolan.org/")
|
||||||
(synopsis "Audio and video framework")
|
(synopsis "Audio and video framework")
|
||||||
(description "VLC is a cross-platform multimedia player and framework
|
(description "VLC is a cross-platform multimedia player and framework
|
||||||
|
@ -3250,7 +3249,8 @@ (define-public youtube-viewer
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list perl-module-build))
|
(list perl-module-build))
|
||||||
(inputs
|
(inputs
|
||||||
(list perl-data-dump
|
(list bash-minimal
|
||||||
|
perl-data-dump
|
||||||
perl-file-sharedir
|
perl-file-sharedir
|
||||||
perl-gtk2
|
perl-gtk2
|
||||||
perl-json
|
perl-json
|
||||||
|
@ -3284,8 +3284,7 @@ (define-public youtube-viewer
|
||||||
"bin/gtk3-youtube-viewer")
|
"bin/gtk3-youtube-viewer")
|
||||||
(("'xdg-open'")
|
(("'xdg-open'")
|
||||||
(format #f "'~a/bin/xdg-open'"
|
(format #f "'~a/bin/xdg-open'"
|
||||||
(assoc-ref inputs "xdg-utils"))))
|
(assoc-ref inputs "xdg-utils"))))))
|
||||||
#t))
|
|
||||||
(add-after 'install 'install-desktop
|
(add-after 'install 'install-desktop
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
@ -3293,8 +3292,7 @@ (define-public youtube-viewer
|
||||||
(install-file "share/gtk-youtube-viewer.desktop"
|
(install-file "share/gtk-youtube-viewer.desktop"
|
||||||
(string-append sharedir "/applications"))
|
(string-append sharedir "/applications"))
|
||||||
(install-file "share/icons/gtk-youtube-viewer.png"
|
(install-file "share/icons/gtk-youtube-viewer.png"
|
||||||
(string-append sharedir "/pixmaps"))
|
(string-append sharedir "/pixmaps")))))
|
||||||
#t)))
|
|
||||||
(add-after 'install 'wrap-program
|
(add-after 'install 'wrap-program
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
|
@ -3303,8 +3301,7 @@ (define-public youtube-viewer
|
||||||
(lib-path (getenv "PERL5LIB")))
|
(lib-path (getenv "PERL5LIB")))
|
||||||
(for-each (cut wrap-program <>
|
(for-each (cut wrap-program <>
|
||||||
`("PERL5LIB" ":" prefix (,lib-path ,site-dir)))
|
`("PERL5LIB" ":" prefix (,lib-path ,site-dir)))
|
||||||
(find-files bin-dir))
|
(find-files bin-dir))))))))
|
||||||
#t))))))
|
|
||||||
(synopsis
|
(synopsis
|
||||||
"Lightweight application for searching and streaming videos from YouTube")
|
"Lightweight application for searching and streaming videos from YouTube")
|
||||||
(description
|
(description
|
||||||
|
@ -5895,7 +5892,8 @@ (define-public openshot
|
||||||
(delete-file-recursively "src/images/fonts") #t))))
|
(delete-file-recursively "src/images/fonts") #t))))
|
||||||
(build-system python-build-system)
|
(build-system python-build-system)
|
||||||
(inputs
|
(inputs
|
||||||
(list ffmpeg
|
(list bash-minimal
|
||||||
|
ffmpeg
|
||||||
font-dejavu
|
font-dejavu
|
||||||
libopenshot
|
libopenshot
|
||||||
python
|
python
|
||||||
|
@ -5924,14 +5922,12 @@ (define-public openshot
|
||||||
(substitute* "src/classes/app.py"
|
(substitute* "src/classes/app.py"
|
||||||
(("info.IMAGES_PATH") (string-append "\"" font "\""))
|
(("info.IMAGES_PATH") (string-append "\"" font "\""))
|
||||||
(("fonts") "share/fonts/truetype")
|
(("fonts") "share/fonts/truetype")
|
||||||
(("[A-Za-z_-]+.ttf") "DejaVuSans.ttf")))
|
(("[A-Za-z_-]+.ttf") "DejaVuSans.ttf")))))
|
||||||
#t))
|
|
||||||
(add-before 'install 'set-tmp-home
|
(add-before 'install 'set-tmp-home
|
||||||
(lambda _
|
(lambda _
|
||||||
;; src/classes/info.py "needs" to create several
|
;; src/classes/info.py "needs" to create several
|
||||||
;; directories in $HOME when loaded during build
|
;; directories in $HOME when loaded during build
|
||||||
(setenv "HOME" "/tmp")
|
(setenv "HOME" "/tmp")))
|
||||||
#t))
|
|
||||||
(add-after 'install 'wrap-program
|
(add-after 'install 'wrap-program
|
||||||
(lambda* (#:key outputs inputs #:allow-other-keys)
|
(lambda* (#:key outputs inputs #:allow-other-keys)
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(let ((out (assoc-ref outputs "out"))
|
||||||
|
@ -6086,7 +6082,8 @@ (define-public gaupol
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list gettext-minimal pkg-config))
|
(list gettext-minimal pkg-config))
|
||||||
(inputs
|
(inputs
|
||||||
(list python-pygobject
|
(list bash-minimal
|
||||||
|
python-pygobject
|
||||||
gtk+
|
gtk+
|
||||||
python-pycairo ; Required or else clicking on a subtitle line fails.
|
python-pycairo ; Required or else clicking on a subtitle line fails.
|
||||||
python-chardet ; Optional: Character encoding detection.
|
python-chardet ; Optional: Character encoding detection.
|
||||||
|
@ -6537,7 +6534,10 @@ (define-public get-iplayer
|
||||||
`("PERL5LIB" ":"
|
`("PERL5LIB" ":"
|
||||||
prefix (,(string-append perllib ":" (getenv "PERL5LIB")))))))))))
|
prefix (,(string-append perllib ":" (getenv "PERL5LIB")))))))))))
|
||||||
(inputs
|
(inputs
|
||||||
(list perl-mojolicious perl-lwp-protocol-https perl-xml-libxml))
|
(list bash-minimal
|
||||||
|
perl-mojolicious
|
||||||
|
perl-lwp-protocol-https
|
||||||
|
perl-xml-libxml))
|
||||||
(home-page "https://github.com/get-iplayer/get_iplayer")
|
(home-page "https://github.com/get-iplayer/get_iplayer")
|
||||||
(synopsis "Download or stream available BBC iPlayer TV and radio programmes")
|
(synopsis "Download or stream available BBC iPlayer TV and radio programmes")
|
||||||
(description "@code{get_iplayer} lists, searches and records BBC iPlayer
|
(description "@code{get_iplayer} lists, searches and records BBC iPlayer
|
||||||
|
|
Loading…
Reference in a new issue