From e51cfc777a6eec498d946a837f2aa44b8b92587b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 3 Mar 2010 10:37:38 +0000
Subject: [PATCH] Added libv4l which is now a required dependency for
 kdenetwork-4.4.1

svn path=/nixpkgs/trunk/; revision=20349
---
 pkgs/desktops/kde-4.4/default.nix             |  2 +-
 pkgs/desktops/kde-4.4/network/default.nix     |  4 ++--
 pkgs/development/libraries/libv4l/default.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++++-
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/libv4l/default.nix

diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index a745a47cc0a3..e3eb9ba7af57 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -145,7 +145,7 @@ pkgs.recurseIntoAttrs (rec {
   
   kdenetwork = import ./network {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
-    inherit (pkgs) libidn libvncserver tapioca_qt libmsn giflib gpgme boost;
+    inherit (pkgs) libidn libvncserver tapioca_qt libmsn giflib gpgme boost libv4l;
     inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm;
     inherit kdelibs kdepimlibs;
     inherit automoc4 phonon qca2 soprano qimageblitz strigi;
diff --git a/pkgs/desktops/kde-4.4/network/default.nix b/pkgs/desktops/kde-4.4/network/default.nix
index 3f472e681341..6b5e539f525b 100644
--- a/pkgs/desktops/kde-4.4/network/default.nix
+++ b/pkgs/desktops/kde-4.4/network/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
-, libvncserver, tapioca_qt, libmsn, giflib, gpgme, boost
+, libvncserver, tapioca_qt, libmsn, giflib, gpgme, boost, libv4l
 , libXi, libXtst, libXdamage, libXxf86vm
 , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1h19pp8i009aahli2sn8qzz8i49lq80v6bxwbgw2qxpqpz1s2h7r";
   };
   buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
-                  libvncserver tapioca_qt libmsn giflib gpgme boost stdenv.gcc.libc
+                  libvncserver tapioca_qt libmsn giflib gpgme boost stdenv.gcc.libc libv4l
 		  libXi libXtst libXdamage libXxf86vm
                   kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ];
   meta = {
diff --git a/pkgs/development/libraries/libv4l/default.nix b/pkgs/development/libraries/libv4l/default.nix
new file mode 100644
index 000000000000..fac2135b9ed5
--- /dev/null
+++ b/pkgs/development/libraries/libv4l/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libv4l-0.6.2";
+  src = fetchurl {
+    url = http://people.atrpms.net/~hdegoede/libv4l-0.6.1.tar.gz;
+    sha256 = "1grbyb9vsdlp6yx4inmazgp5g0jxga8wbl3h8dv6vlfh5hckxf9n";
+  };
+  installPhase = "make PREFIX=$out install";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30d98d084515..c013d070c05e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4450,6 +4450,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  libv4l = import ../development/libraries/libv4l {
+    inherit stdenv fetchurl;
+  };
+
   libvirt = import ../development/libraries/libvirt {
     inherit stdenv fetchurl libxml2 gnutls devicemapper perl;
   };
@@ -8660,7 +8664,7 @@ let
   };
 
   kde4 = kde43;
-
+  
   kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // {
     openexr = openexr_1_6_1;
     qt4 = qt45;