public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9911 from mstrm/vlc

Browse Source 
vlc: use libsamplerate
This commit is contained in:
Domen Kožar 2015-09-18 13:34:05 +02:00
commit f1733ab582
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/video/vlc/default.nix
View File

@ -6,7 +6,7 @@
, mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image , mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
, libvdpau , libvdpau, libsamplerate
, onlyLibVLC ? false , onlyLibVLC ? false
, qt4 ? null, qt5 ? null, withQt5 ? false , qt4 ? null, qt5 ? null, withQt5 ? false
, jackSupport ? false , jackSupport ? false
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
libkate libtiger libv4l samba liboggz libass libdvbpsi libva libkate libtiger libv4l samba liboggz libass libdvbpsi libva
xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
libdc1394 libraw1394 libopus libebml libmatroska libvdpau libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
] ]
++ (if withQt5 then with qt5; [ base ] else [qt4]) ++ (if withQt5 then with qt5; [ base ] else [qt4])
++ optional jackSupport libjack2; ++ optional jackSupport libjack2;
@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
"--enable-ncurses" "--enable-ncurses"
"--enable-vdpau" "--enable-vdpau"
"--enable-dvdnav" "--enable-dvdnav"
"--enable-samplerate"
] ]
++ optional onlyLibVLC "--disable-vlc"; ++ optional onlyLibVLC "--disable-vlc";