diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-23 10:38:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-23 10:42:34 +0200 |
| commit | 76ef7a93e302a4a92954e4b40863c6702df5ac8d (patch) | |
| tree | 421a74c886dadc0001b7f42a78ad2cf8b1a5de6f /pkgs/applications/video/vlc | |
| parent | 6b0add86b99f7d03f6bc80c1742f79e80b9ae413 (diff) | |
| parent | eb09b1fd856e7346d60188b2df64fdfe758c2fc4 (diff) | |
| download | nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.gz nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.bz2 nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.lz nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.xz nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.tar.zst nixlib-76ef7a93e302a4a92954e4b40863c6702df5ac8d.zip | |
Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
Diffstat (limited to 'pkgs/applications/video/vlc')
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 80aa1b3c5c33..732d8cd8a0a4 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray +{ stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva - xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms + xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate ] ++ (if withQt5 then with qt5; [ base ] else [qt4]) |