* Update kdegames.

svn path=/nixpkgs/branches/kde-4.7/; revision=27894

pkgs/desktops/kde-4.7/default.nix

@@ -61,6 +61,10 @@ recurseIntoAttrs rec {
   # Backwards compatibility.
   kdebase_workspace = kde_workspace;
 
+### BINDINGS
+
+  pykde4 = callPackage ./pykde4.nix { };
+
 ### OTHER MODULES
 
   gwenview = callPackage ./gwenview.nix { };
@@ -79,6 +83,8 @@ recurseIntoAttrs rec {
 
   kde_wallpapers = callPackage ./wallpapers.nix { };
 
+  kdegames = callPackage ./games.nix { };
+
   /*
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };

pkgs/desktops/kde-4.7/games.nix

@@ -0,0 +1,26 @@
+{ kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
+, twisted, pythonPackages, pyqt4, sip, makeWrapper, phonon, pykde4 }:
+
+kde.package rec {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon shared_mime_info qca2
+      pythonPackages.python pythonPackages.wrapPython
+    ] ++ pythonPath;
+
+  pythonPath =
+    [ pythonPackages.twisted pyqt4 pykde4 ];
+    
+  # TODO: ggz
+
+  postInstall =
+    ''
+      wrapPythonPrograms
+    '';
+
+  meta = {
+    description = "KDE Games";
+    license = "GPL";
+    kde.name = "kdegames";
+  };
+}

pkgs/desktops/kde-4.7/games/default.nix

@@ -1,19 +0,0 @@
-{kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
-, kdebindings, twisted, python, pyqt4, sip, makeWrapper }:
-
-kde.package {
-
-# TODO: ggz
-  buildInputs = [ cmake qt4 perl shared_mime_info kdelibs automoc4 qca2
-    kdebindings twisted python pyqt4 sip makeWrapper ];
-
-  postInstall = ''
-    wrapProgram $out/bin/kajongg --set PYTHONPATH $PYTHONPATH
-    wrapProgram $out/bin/kajonggserver --set PYTHONPATH $PYTHONPATH'';
-
-  meta = {
-    description = "KDE Games";
-    license = "GPL";
-    kde.name = "kdegames";
-  };
-}

pkgs/desktops/kde-4.7/pykde4.nix

@@ -0,0 +1,23 @@
+{ kde, cmake, qt4, automoc4, kdelibs, phonon, python, sip, pyqt4
+, soprano, kdepimlibs, shared_desktop_ontologies, boost }:
+
+kde.package {
+
+  buildInputs =
+    [ cmake kdelibs qt4 automoc4 phonon python sip pyqt4 soprano
+      kdepimlibs shared_desktop_ontologies boost
+    ];
+
+  NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
+
+  preConfigure =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace '{SIP_DEFAULT_SIP_DIR}' '{CMAKE_INSTALL_PREFIX}/share/sip'
+    '';
+
+  meta = {
+    description = "Python bindings for KDE";
+    kde.name = "pykde4";
+  };
+}

pkgs/development/libraries/attica/default.nix

@@ -1,12 +1,15 @@
-{stdenv, fetchurl, cmake, qt4}:
+{ stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
   name = "attica-0.2.0";
+  
   src = fetchurl {
     url = "mirror://kde/stable/attica/${name}.tar.bz2";
     sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a";
   };
+  
   buildInputs = [ cmake qt4 ];
+  
   meta = with stdenv.lib; {
     description = "A library to access Open Collaboration Service providers";
     license = "LGPL";

pkgs/development/python-modules/pyqt/default.nix

@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
     python configure.py $configureFlags "''${configureFlagsArray[@]}"
   '';
 
-  buildInputs = [ python pkgconfig makeWrapper sip qt4 pythonDBus ];
+  buildInputs = [ python pkgconfig makeWrapper qt4 ];
+
+  propagatedBuildInputs = [ sip pythonDBus ];
 
   postInstall = ''
     for i in $out/bin/*; do