Fixed kdenetwork and accessibility
svn path=/nixpkgs/trunk/; revision=18168
This commit is contained in:
parent
cf707c5761
commit
9d3ccc5116
@ -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 {
|
stdenv.mkDerivation {
|
||||||
name = "kdeaccessibility-4.3.3";
|
name = "kdeaccessibility-4.3.3";
|
||||||
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
|||||||
sha1 = "g71fn825bd3ici3vypjgnizypgv345hw";
|
sha1 = "g71fn825bd3ici3vypjgnizypgv345hw";
|
||||||
};
|
};
|
||||||
includeAllQtDirs=true;
|
includeAllQtDirs=true;
|
||||||
buildInputs = [ cmake qt4 perl alsaLib libXtst kdelibs automoc4 phonon ];
|
buildInputs = [ cmake qt4 perl alsaLib libXi libXtst kdelibs automoc4 phonon ];
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE accessibility tools";
|
description = "KDE accessibility tools";
|
||||||
license = "GPL";
|
license = "GPL";
|
||||||
|
@ -114,7 +114,7 @@ pkgs.recurseIntoAttrs (rec {
|
|||||||
|
|
||||||
kdeaccessibility = import ./accessibility {
|
kdeaccessibility = import ./accessibility {
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl alsaLib;
|
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl alsaLib;
|
||||||
inherit (pkgs.xlibs) libXtst;
|
inherit (pkgs.xlibs) libXi libXtst;
|
||||||
inherit kdelibs;
|
inherit kdelibs;
|
||||||
inherit automoc4 phonon;
|
inherit automoc4 phonon;
|
||||||
};
|
};
|
||||||
@ -145,7 +145,7 @@ pkgs.recurseIntoAttrs (rec {
|
|||||||
kdenetwork = import ./network {
|
kdenetwork = import ./network {
|
||||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl gmp speex libxml2 libxslt sqlite alsaLib;
|
inherit (pkgs) stdenv fetchurl lib 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 libXxf86vm;
|
inherit (pkgs.xlibs) libXi libXtst libXdamage libXxf86vm;
|
||||||
inherit kdelibs kdepimlibs;
|
inherit kdelibs kdepimlibs;
|
||||||
inherit automoc4 phonon qca2 soprano qimageblitz strigi;
|
inherit automoc4 phonon qca2 soprano qimageblitz strigi;
|
||||||
};
|
};
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
|
{ stdenv, fetchurl, lib, cmake, qt4, perl, speex, gmp, libxml2, libxslt, sqlite, alsaLib, libidn
|
||||||
, libvncserver, tapioca_qt, libmsn
|
, libvncserver, tapioca_qt, libmsn
|
||||||
, libXtst, libXdamage, libXxf86vm
|
, libXi, libXtst, libXdamage, libXxf86vm
|
||||||
, kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
|
, kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz, strigi}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
@ -13,7 +13,7 @@ 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 libXxf86vm
|
libXi libXtst libXdamage libXxf86vm
|
||||||
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ];
|
kdelibs kdepimlibs automoc4 phonon qca2 soprano qimageblitz strigi ];
|
||||||
meta = {
|
meta = {
|
||||||
description = "KDE network utilities";
|
description = "KDE network utilities";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user