Added support for KDE 4.2 python modules

svn path=/nixpkgs/trunk/; revision=14461

4 files changed, 28 insertions, 13 deletions

diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix
index 0ed7e90f20879..573876bb99daa 100644
--- a/pkgs/desktops/kde-4.2/base-workspace/default.nix
+++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix
@@ -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 ];
 }
diff --git a/pkgs/desktops/kde-4.2/default.nix b/pkgs/desktops/kde-4.2/default.nix
index 1ee4a0e90098a..7407dd5fcb3e6 100644
--- a/pkgs/desktops/kde-4.2/default.nix
+++ b/pkgs/desktops/kde-4.2/default.nix
@@ -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;
   };
   
diff --git a/pkgs/desktops/kde-4.2/utils/builder.sh b/pkgs/desktops/kde-4.2/utils/builder.sh
new file mode 100644
index 0000000000000..c1ec2b7e1cd83
--- /dev/null
+++ b/pkgs/desktops/kde-4.2/utils/builder.sh
@@ -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
diff --git a/pkgs/desktops/kde-4.2/utils/default.nix b/pkgs/desktops/kde-4.2/utils/default.nix
index 37a55b9931e5f..a77c2feed9db6 100644
--- a/pkgs/desktops/kde-4.2/utils/default.nix
+++ b/pkgs/desktops/kde-4.2/utils/default.nix
@@ -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 ];
 }