summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-05-08 09:49:38 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-05-08 09:49:38 +0000
commit9b2efc0a33636a57e06b2d92e7f38dcd5825b2f0 (patch)
tree5016b36ec10fc39f652a76fab7d0008cd5c58660 /pkgs
parent829e78f78f9353a0c108f1449a78b424984a4ceb (diff)
downloadnixlib-9b2efc0a33636a57e06b2d92e7f38dcd5825b2f0.tar
nixlib-9b2efc0a33636a57e06b2d92e7f38dcd5825b2f0.tar.gz
nixlib-9b2efc0a33636a57e06b2d92e7f38dcd5825b2f0.tar.bz2
nixlib-9b2efc0a33636a57e06b2d92e7f38dcd5825b2f0.tar.lz
nixlib-9b2efc0a33636a57e06b2d92e7f38dcd5825b2f0.tar.xz
nixlib-9b2efc0a33636a57e06b2d92e7f38dcd5825b2f0.tar.zst
nixlib-9b2efc0a33636a57e06b2d92e7f38dcd5825b2f0.zip
Adding support in VLC for 1394 cameras.
svn path=/nixpkgs/trunk/; revision=34012
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/video/vlc/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 00459a2d4847..b33bcddbffb8 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -5,7 +5,7 @@
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva, libdvbpsi
+, libass, libva, libdvbpsi, libdc1394, libraw1394
 }:
 
 stdenv.mkDerivation rec {
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
       udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
+      libdc1394 libraw1394
     ];
 
   buildNativeInputs = [ pkgconfig ];
@@ -31,6 +32,7 @@ stdenv.mkDerivation rec {
   configureFlags =
     [ "--enable-alsa"
       "--with-kde-solid=$out/share/apps/solid/actions"
+      "--enable-dc1394"
     ];
 
   preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure'';