diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-01-13 00:39:38 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-01-13 00:39:38 +0100 |
commit | 570d84a01eb5d511b1d5b75162e97c1c347d49f2 (patch) | |
tree | 8897828eb74c5b282ecbc8a6a483a02dbe5d0ac7 /pkgs/applications/video | |
parent | 6ca8443c3be92457ecd4f81532687f99281cbcae (diff) | |
parent | 3131a8ea84a35437b5617598dc3fd3d0bb135829 (diff) |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/cinelerra/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/kodi/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/video/xawtv/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/video/xine-ui/default.nix | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 090afde819949..eb3946b9ed03f 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -2,7 +2,7 @@ , pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr -, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xextproto, libtheora, libpng +, libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng , libdv, libuuid, file, nasm, perl , fontconfig, intltool }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype mjpegtools x264 gettext openexr - libXext libXxf86vm libXv libXi libX11 libXft xextproto + libXext libXxf86vm libXv libXi libX11 libXft xorgproto libtheora libpng libdv libuuid nasm perl diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 9272d3c8e2690..05105b64af746 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -4,10 +4,10 @@ , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre -, libX11, xproto, inputproto, libxml2 -, libXt, libXmu, libXext, xextproto -, libXinerama, libXrandr, randrproto -, libXtst, libXfixes, fixesproto, systemd +, libX11, xorgproto, libxml2 +, libXt, libXmu, libXext +, libXinerama, libXrandr +, libXtst, libXfixes, systemd , alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl , libjpeg, jasper, libpng, libtiff , libmpeg2, libsamplerate, libmad @@ -123,8 +123,8 @@ in stdenv.mkDerivation rec { boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm openssl gperf tinyxml2 taglib libssh swig jre - libX11 xproto inputproto libXt libXmu libXext xextproto - libXinerama libXrandr randrproto libXtst libXfixes fixesproto + libX11 xorgproto libXt libXmu libXext + libXinerama libXrandr libXtst libXfixes alsaLib libGLU_combined glew fontconfig freetype ftgl libjpeg jasper libpng libtiff wayland libmpeg2 libsamplerate libmad diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 5bc9ad8852a16..f6f8016ec1d36 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xproto, libv4l -, libFS, fontsproto, libXaw, libXpm, libXext, libSM, libICE, perl, xextproto, linux}: +{stdenv, fetchurl, ncurses, libjpeg, libX11, libXt, alsaLib, aalib, libXft, xorgproto, libv4l +, libFS, libXaw, libXpm, libXext, libSM, libICE, perl, linux}: stdenv.mkDerivation rec { name = "xawtv-3.105"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX="; - buildInputs = [ncurses libjpeg libX11 libXt libXft xproto libFS perl alsaLib aalib - fontsproto libXaw libXpm libXext libSM libICE xextproto libv4l]; + buildInputs = [ncurses libjpeg libX11 libXt libXft xorgproto libFS perl alsaLib aalib + libXaw libXpm libXext libSM libICE libv4l]; meta = { description = "TV application for Linux with apps and tools such as a teletext browser"; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 4dfc3fd052a25..4d3d88d5be8dd 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg - xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.inputproto + xorg.xlibsWrapper xorg.libXext xorg.libXv xorg.libXxf86vm xorg.libXtst xorg.xorgproto xorg.libXinerama xorg.libXi xorg.libXft ]; |