From 9d3ccc5116b54bcb4cab8fa9c102e46892e28eaf Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 5 Nov 2009 22:16:31 +0000 Subject: [PATCH] Fixed kdenetwork and accessibility svn path=/nixpkgs/trunk/; revision=18168 --- pkgs/desktops/kde-4.3/accessibility/default.nix | 4 ++-- pkgs/desktops/kde-4.3/default.nix | 4 ++-- pkgs/desktops/kde-4.3/network/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/kde-4.3/accessibility/default.nix b/pkgs/desktops/kde-4.3/accessibility/default.nix index 4433d2d9e38a..be43beb35743 100644 --- a/pkgs/desktops/kde-4.3/accessibility/default.nix +++ b/pkgs/desktops/kde-4.3/accessibility/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXtst, kdelibs, automoc4, phonon}: +{stdenv, fetchurl, lib, cmake, qt4, perl, alsaLib, libXi, libXtst, kdelibs, automoc4, phonon}: stdenv.mkDerivation { name = "kdeaccessibility-4.3.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha1 = "g71fn825bd3ici3vypjgnizypgv345hw"; }; includeAllQtDirs=true; - buildInputs = [ cmake qt4 perl alsaLib libXtst kdelibs automoc4 phonon ]; + buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ]; meta = { description = "KDE accessibility tools"; license = "GPL"; diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index e622a4fb46c4..eab77cec6e56 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -114,7 +114,7 @@ pkgs.recurseIntoAttrs (rec { kdeaccessibility = import ./accessibility { inherit (pkgs) stdenv fetchurl lib cmake qt4 perl alsaLib; - inherit (pkgs.xlibs) libXtst; + inherit (pkgs.xlibs) libXi libXtst; inherit kdelibs; inherit automoc4 phonon; }; @@ -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; - inherit (pkgs.xlibs) libXtst libXdamage libXxf86vm; + inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm; inherit kdelibs kdepimlibs; inherit automoc4 phonon qca2 soprano qimageblitz strigi; }; diff --git a/pkgs/desktops/kde-4.3/network/default.nix b/pkgs/desktops/kde-4.3/network/default.nix index e214db7dbcf7..fed7de07e951 100644 --- a/pkgs/desktops/kde-4.3/network/default.nix +++ b/pkgs/desktops/kde-4.3/network/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn , libvncserver, tapioca_qt, libmsn -, libXtst, libXdamage, libXxf86vm +, libXi, libXtst, libXdamage, libXxf86vm , kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn libvncserver tapioca_qt libmsn - libXtst libXdamage libXxf86vm + libXi libXtst libXdamage libXxf86vm kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ]; meta = { description = "KDE network utilities";