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

Added libv4l which is now a required dependency for kdenetwork-4.4.1

Browse Source 
svn path=/nixpkgs/trunk/; revision=20349
This commit is contained in:
Sander van der Burg 2010-03-03 10:37:38 +00:00
parent 5984fe2daa
commit e51cfc777a
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.4/default.nix
View File

@ -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;

4
pkgs/desktops/kde-4.4/network/default.nix
View File

@ -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 = {

10
pkgs/development/libraries/libv4l/default.nix Normal file
View File

@ -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";
}

6
pkgs/top-level/all-packages.nix
View File

@ -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;