From aaffbe6971657851b52ea38d96e7c12cc2fb3b20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 13 Feb 2010 15:37:06 +0000
Subject: [PATCH] kdeedu builds, and kdebindings build

svn path=/nixpkgs/trunk/; revision=19976
---
 pkgs/desktops/kde-4.4/bindings/default.nix | 4 ++++
 pkgs/desktops/kde-4.4/default.nix          | 2 +-
 pkgs/desktops/kde-4.4/edu/default.nix      | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-4.4/bindings/default.nix b/pkgs/desktops/kde-4.4/bindings/default.nix
index 18fd8fea5fc..6d38c15f3f4 100644
--- a/pkgs/desktops/kde-4.4/bindings/default.nix
+++ b/pkgs/desktops/kde-4.4/bindings/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation {
   
   # Disable smoke because I don't need it and gives us an error
   cmakeFlags = [ "-DENABLE_SMOKE=OFF" ];
+  preConfigure = ''
+    cmakeFlags="$cmakeFlags -DPYTHON_SITE_PACKAGES_DIR=$out/lib/${python.libPrefix}/site-packages"
+    cmakeFlags="$cmakeFlags -DSIP_DEFAULT_SIP_DIR=$out/share/sip"
+  '';
   
   # Okular seems also an optional depenedency which I left out
   buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix
index 2d63ddc82a0..cc672b6a396 100644
--- a/pkgs/desktops/kde-4.4/default.nix
+++ b/pkgs/desktops/kde-4.4/default.nix
@@ -125,7 +125,7 @@ pkgs.recurseIntoAttrs (rec {
   kdeedu = import ./edu {
     inherit (pkgs) stdenv fetchurl lib cmake qt4 perl libxml2 libxslt openbabel boost;
     inherit (pkgs) readline gmm gsl facile ocaml xplanet;
-    inherit kdelibs;
+    inherit kdelibs attica;
     inherit automoc4 phonon eigen;
   };
   
diff --git a/pkgs/desktops/kde-4.4/edu/default.nix b/pkgs/desktops/kde-4.4/edu/default.nix
index 8d155a60cfe..bb059d61453 100644
--- a/pkgs/desktops/kde-4.4/edu/default.nix
+++ b/pkgs/desktops/kde-4.4/edu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, cmake, qt4, perl, libxml2, libxslt, openbabel, boost, readline, gmm, gsl
 , facile, ocaml, xplanet
-, kdelibs, automoc4, phonon, eigen}:
+, kdelibs, automoc4, phonon, eigen, attica}:
 
 stdenv.mkDerivation {
   name = "kdeedu-4.4.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "0qc7y361ndpmvjpkdxa7psvx9brx3lhwp5fmm94j6gva7kvyad9d";
   };
   buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile ocaml xplanet
-                  kdelibs automoc4 phonon eigen ];
+                  kdelibs automoc4 phonon eigen attica ];
   meta = {
     description = "KDE Educative software";
     license = "GPL";