Added support for X11 VidMode extension to kdenetwork

svn path=/nixpkgs/trunk/; revision=14462
This commit is contained in:
Sander van der Burg
2009-03-09 15:01:37 +00:00
parent a901776a5f
commit f9d5952ed5
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -120,7 +120,7 @@ rec {
kdenetwork = import ./network { kdenetwork = import ./network {
inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib; inherit (pkgs) stdenv fetchurl cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
inherit (pkgs) libidn libvncserver tapioca_qt libmsn; inherit (pkgs) libidn libvncserver tapioca_qt libmsn;
inherit (pkgs.xlibs) libXtst libXdamage; inherit (pkgs.xlibs) libXtst libXdamage libXxf86vm;
inherit kdelibs kdepimlibs; inherit kdelibs kdepimlibs;
inherit automoc4 phonon qca2 soprano qimageblitz; inherit automoc4 phonon qca2 soprano qimageblitz;
}; };
+2 -2
View File
@@ -1,6 +1,6 @@
{stdenv, fetchurl, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn, {stdenv, fetchurl, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn,
libvncserver, tapioca_qt, libmsn, libvncserver, tapioca_qt, libmsn,
libXtst, libXdamage, libXtst, libXdamage, libXxf86vm,
kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}: kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}:
stdenv.mkDerivation { stdenv.mkDerivation {
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
CMAKE_PREFIX_PATH=kdepimlibs; CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn
libvncserver tapioca_qt libmsn libvncserver tapioca_qt libmsn
libXtst libXdamage libXtst libXdamage libXxf86vm
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz ]; kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz ];
} }