Merge branch 'master' into x-updates

Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).

1 files changed, 5 insertions, 3 deletions

diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix
index d862c7012c49..d7fab74e6cac 100644
--- a/pkgs/applications/video/kdenlive/default.nix
+++ b/pkgs/applications/video/kdenlive/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, kdelibs, automoc4, phonon
 , mlt, gettext , qimageblitz, qjson, shared_mime_info, soprano
-, pkgconfig, shared_desktop_ontologies }:
+, pkgconfig, shared_desktop_ontologies, libv4l }:
 
 stdenv.mkDerivation rec {
   name = "kdenlive-${version}";
@@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "1rw2cbzy5mabwijvryyzbhpgldn2zy5jy4j87hl4m1i8ah9lgi7x";
   };
 
-  buildInputs = 
+  buildInputs =
     [ cmake qt4 perl kdelibs automoc4 phonon mlt gettext qimageblitz
-      qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies
+      qjson shared_mime_info soprano pkgconfig shared_desktop_ontologies libv4l
     ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Free and open source video editor";
     license = "GPLv2+";