Added support for KDE 4.2 python modules

svn path=/nixpkgs/trunk/; revision=14461
This commit is contained in:
Sander van der Burg 2009-03-09 14:44:42 +00:00
parent a61ee3644c
commit a901776a5f
4 changed files with 28 additions and 13 deletions

View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, cmake, perl, python,
qt4, kdelibs, kdepimlibs,
libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage,
qt4, sip, pyqt4, kdelibs, kdepimlibs, kdebindings,
libXi, libXau, libXdmcp, libXtst, libXcomposite, libXdamage, libXScrnSaver,
lm_sensors, libxklavier, libusb, pthread_stubs, boost,
automoc4, phonon, strigi, soprano, qimageblitz}:
@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha1 = "412b8a6778d5c71a366c054b0136edae309bbef0";
};
CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake perl python qt4 kdelibs kdepimlibs pthread_stubs boost libusb stdenv.gcc.libc
libXi libXau libXdmcp libXtst libXcomposite libXdamage
buildInputs = [ cmake perl python qt4 sip pyqt4 kdelibs kdepimlibs kdebindings pthread_stubs boost libusb stdenv.gcc.libc
libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver
lm_sensors libxklavier automoc4 phonon strigi soprano qimageblitz ];
}

View File

@ -54,10 +54,10 @@ rec {
### BASE
kdebase_workspace = import ./base-workspace {
inherit (pkgs) stdenv fetchurl cmake qt4 perl python;
inherit (pkgs) stdenv fetchurl cmake qt4 perl python sip pyqt4;
inherit (pkgs) lm_sensors libxklavier libusb pthread_stubs boost;
inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage;
inherit kdelibs kdepimlibs;
inherit (pkgs.xlibs) libXi libXau libXdmcp libXtst libXcomposite libXdamage libXScrnSaver;
inherit kdelibs kdepimlibs kdebindings;
inherit automoc4 phonon strigi soprano qimageblitz;
};
@ -152,8 +152,8 @@ rec {
};
kdeutils = import ./utils {
inherit (pkgs) stdenv fetchurl cmake qt4 perl python gmp libzip libarchive;
inherit kdelibs kdepimlibs;
inherit (pkgs) stdenv fetchurl cmake qt4 perl python gmp libzip libarchive sip pyqt4 pycups system_config_printer rhpl;
inherit kdelibs kdepimlibs kdebindings;
inherit automoc4 phonon qimageblitz;
};

View File

@ -0,0 +1,13 @@
source $stdenv/setup
myPatchPhase()
{
for i in printer-applet/cmake-modules/FindSystemConfigPrinter.py printer-applet/printer-applet.py
do
sed -i -e "s|/usr/share/system-config-printer|$system_config_printer/share/system-config-printer|" $i
done
sed -i -e "s|import cupshelpers.ppds, cupshelpers.cupshelpers|import ppds, cupshelpers|" printer-applet/cmake-modules/FindSystemConfigPrinter.py
}
patchPhase=myPatchPhase
genericBuild

View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, cmake, qt4, perl, gmp, python, libzip, libarchive,
kdelibs, kdepimlibs, automoc4, phonon, qimageblitz}:
{stdenv, fetchurl, cmake, qt4, perl, gmp, python, libzip, libarchive, sip, pyqt4, pycups, system_config_printer, rhpl,
kdelibs, kdepimlibs, kdebindings, automoc4, phonon, qimageblitz}:
stdenv.mkDerivation {
name = "kdeutils-4.2.1";
@ -7,7 +7,9 @@ stdenv.mkDerivation {
url = mirror://kde/stable/4.2.1/src/kdeutils-4.2.1.tar.bz2;
sha1 = "2f875d05584b25b928b38e1da2b04c073acefd35";
};
builder = ./builder.sh;
inherit system_config_printer;
CMAKE_PREFIX_PATH=kdepimlibs;
buildInputs = [ cmake qt4 perl gmp python libzip libarchive
kdelibs kdepimlibs automoc4 phonon qimageblitz ];
buildInputs = [ cmake qt4 perl gmp python libzip libarchive sip pyqt4 pycups system_config_printer rhpl
kdelibs kdepimlibs kdebindings automoc4 phonon qimageblitz ];
}