From e4b1633d6b65f24e6863254c10f653ee177f034c Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sat, 13 Feb 2010 14:02:07 +0000
Subject: [PATCH] Some fixes to kdebindings. I now builds again but still gives
 me a compile error

svn path=/nixpkgs/trunk/; revision=19973
---
 pkgs/desktops/kde-4.4/bindings/default.nix | 16 +++++++++++-----
 pkgs/desktops/kde-4.4/default.nix          |  5 ++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/kde-4.4/bindings/default.nix b/pkgs/desktops/kde-4.4/bindings/default.nix
index 6d69a47d5338..18fd8fea5fcf 100644
--- a/pkgs/desktops/kde-4.4/bindings/default.nix
+++ b/pkgs/desktops/kde-4.4/bindings/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, lib, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4
-, libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}:
+{ stdenv, fetchurl, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
+, kdelibs, kdepimlibs, automoc4, phonon, soprano, akonadi, qimageblitz, attica, polkit_qt
+}:
 
 # This function will only build the pykde4 module. I don't need the other bindings and
 # some bindings are even broken.
@@ -10,9 +11,14 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.4.0/src/kdebindings-4.4.0.tar.bz2;
     sha256 = "1yn0wynnigbp288j9pqfd5cppc6mja9z9pcfz7g789pmyig42jvd";
   };
-  builder = ./builder.sh;
-  buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4
-                  libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ];
+  #builder = ./builder.sh;
+  
+  # Disable smoke because I don't need it and gives us an error
+  cmakeFlags = [ "-DENABLE_SMOKE=OFF" ];
+  
+  # Okular seems also an optional depenedency which I left out
+  buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost
+		  kdelibs kdepimlibs automoc4 phonon soprano akonadi qimageblitz attica polkit_qt ];
   meta = {
     description = "KDE bindings";
     longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 681ded133110..2d63ddc82a03 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -195,9 +195,8 @@ pkgs.recurseIntoAttrs (rec {
 ### DEVELOPMENT
 
   kdebindings = import ./bindings {
-    inherit (pkgs) stdenv fetchurl lib python sip zlib libpng pyqt4 freetype fontconfig qt4;
-    inherit (pkgs.xlibs) libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext;
-    inherit kdelibs;
+    inherit (pkgs) stdenv fetchurl cmake perl lib python sip zlib libpng pyqt4 freetype fontconfig qt4 boost;
+    inherit kdelibs kdepimlibs automoc4 phonon soprano akonadi qimageblitz attica polkit_qt;
   };
   
   kdesdk = import ./sdk {