summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDavid Craven <david@craven.ch>2016-08-20 21:39:42 +0200
committerDavid Craven <david@craven.ch>2016-08-22 01:49:52 +0200
commitc161c22a51534dd17892fd10a9ca8381532e9356 (patch)
treefae2d73b92533db2f3314ddf3477f64d091e0d8d /gnu
parent2cef0f7cc3f92b380206cff6a2c1085f7c6fac2b (diff)
downloadgnu-guix-c161c22a51534dd17892fd10a9ca8381532e9356.tar
gnu-guix-c161c22a51534dd17892fd10a9ca8381532e9356.tar.gz
gnu: vlc: Use monolithic Qt 5.6.
* gnu/packages/video.scm (vlc)[inputs]: Use qt 5.6.1-1. Add libxi.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/video.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index fa0c175434..3c07d23324 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -53,6 +53,7 @@
#:use-module (gnu packages databases)
#:use-module (gnu packages elf)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages fribidi)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
@@ -626,6 +627,7 @@ audio/video codec library.")
("libvorbis" ,libvorbis)
("libtheora" ,libtheora)
("libxext" ,libxext)
+ ("libxi" ,libxi)
("libxinerama" ,libxinerama)
("libxml2" ,libxml2)
("libxpm" ,libxpm)
@@ -635,7 +637,8 @@ audio/video codec library.")
("perl" ,perl)
("pulseaudio" ,pulseaudio)
("python" ,python-wrapper)
- ("qtbase" ,qtbase)
+ ("qt" ,qt) ; FIXME: reenable modular qt after update - requires building
+ ;("qtbase" ,qtbase) with -std=gnu++11.
;("qtx11extras" ,qtx11extras)
("sdl" ,sdl)
("sdl-image" ,sdl-image)