* Update kdegames.

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

4 files changed, 55 insertions, 19 deletions

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index ff4a61ad9b226..373b3ee7819d8 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/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 { };
diff --git a/pkgs/desktops/kde-4.7/games.nix b/pkgs/desktops/kde-4.7/games.nix
new file mode 100644
index 0000000000000..93a262452e549
--- /dev/null
+++ b/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";
+  };
+}
diff --git a/pkgs/desktops/kde-4.7/games/default.nix b/pkgs/desktops/kde-4.7/games/default.nix
deleted file mode 100644
index a83b2a9494aa5..0000000000000
--- a/pkgs/desktops/kde-4.7/games/default.nix
+++ /dev/null
@@ -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";
-  };
-}
diff --git a/pkgs/desktops/kde-4.7/pykde4.nix b/pkgs/desktops/kde-4.7/pykde4.nix
new file mode 100644
index 0000000000000..cca4e89279f23
--- /dev/null
+++ b/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";
+  };
+}