1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix
index 0588f580cc25..e5deba4f97f9 100644
--- a/pkgs/applications/video/xbmc/default.nix
+++ b/pkgs/applications/video/xbmc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeWrapper
 , pkgconfig, cmake, gnumake, yasm, python
-, boost
+, boost, avahi, libdvdcss, lame
 , gettext, pcre, yajl, fribidi
 , openssl, gperf, tinyxml2, taglib, libssh, swig, jre
 , libX11, xproto, inputproto
@@ -20,7 +20,9 @@
 , libusb ? null, usbSupport ? false
 , samba ? null, sambaSupport ? true
 # TODO: would be nice to have nfsSupport (needs libnfs library)
+# TODO: librtmp
 , libvdpau ? null, vdpauSupport ? true
+, pulseaudio ? null, pulseSupport ? false
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -28,13 +30,14 @@ assert udevSupport  -> udev != null;
 assert usbSupport   -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
 assert sambaSupport -> samba != null;
 assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
+assert pulseSupport -> pulseaudio != null;
 
 stdenv.mkDerivation rec {
-    name = "xbmc-12.0";
+    name = "xbmc-12.1";
 
     src = fetchurl {
       url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
-      sha256 = "0vy1a38gfbp9vhbjvwqm11sd76gl3s9q0h7gwpsks85m2k88q0ak";
+      sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9";
     };
 
     buildInputs = [
@@ -53,14 +56,15 @@ stdenv.mkDerivation rec {
       ffmpeg libmpeg2 libsamplerate libmad
       libogg libvorbis flac
       lzo libcdio libmodplug libass
-      sqlite mysql nasm
+      sqlite mysql nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
     ]
     ++ lib.optional dbusSupport dbus_libs
     ++ lib.optional udevSupport udev
     ++ lib.optional usbSupport libusb
     ++ lib.optional sambaSupport samba
-    ++ lib.optional vdpauSupport libvdpau;
+    ++ lib.optional vdpauSupport libvdpau
+    ++ lib.optional pulseSupport pulseaudio;
 
     dontUseCmakeConfigure = true;
 
@@ -69,7 +73,8 @@ stdenv.mkDerivation rec {
       "--disable-webserver"
     ]
     ++ lib.optional (! sambaSupport) "--disable-samba"
-    ++ lib.optional vdpauSupport "--enable-vdpau";
+    ++ lib.optional vdpauSupport "--enable-vdpau"
+    ++ lib.optional pulseSupport "--enable-pulse";
 
     postInstall = ''
       for p in $(ls $out/bin/) ; do