From 333dfb869e3f3592a81fbda3b5b681a0e44b1bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 12 Feb 2010 17:53:51 +0000
Subject: [PATCH] More on kde44 builds. More findqt4.cmake copies around fixed,
 and set shared_desktop_ontologies to be propagated in kdelibs. (Maybe only
 kdegraphics wants it? I think more will want it, so I set it in
 propagatedBuildInputs)

svn path=/nixpkgs/trunk/; revision=19962
---
 pkgs/desktops/kde-4.4/libs/default.nix                | 4 +++-
 pkgs/desktops/kde-4.4/support/akonadi/default.nix     | 3 +++
 pkgs/desktops/kde-4.4/support/qimageblitz/default.nix | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.4/libs/default.nix b/pkgs/desktops/kde-4.4/libs/default.nix
index 50f296ee169..08e17ee9b8c 100644
--- a/pkgs/desktops/kde-4.4/libs/default.nix
+++ b/pkgs/desktops/kde-4.4/libs/default.nix
@@ -19,10 +19,12 @@ stdenv.mkDerivation {
   buildInputs = [
     cmake perl qt4 stdenv.gcc.libc xz flex bison bzip2 pcre fam libxml2 libxslt
     shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
-    shared_desktop_ontologies libXScrnSaver
+    libXScrnSaver
     automoc4 phonon strigi soprano qca2 attica polkit_qt
   ];
 
+  propagatedBuildInputs = [ shared_desktop_ontologies ];
+
   CMAKE_PREFIX_PATH=shared_desktop_ontologies;
 
   # I don't know why cmake does not find the acl files (but finds attr files)
diff --git a/pkgs/desktops/kde-4.4/support/akonadi/default.nix b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
index 058dcfedb87..6ea972c57ad 100644
--- a/pkgs/desktops/kde-4.4/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.4/support/akonadi/default.nix
@@ -6,6 +6,9 @@ stdenv.mkDerivation {
     url = http://download.akonadi-project.org/akonadi-1.3.1.tar.bz2;
     sha256 = "1pbn6sviipxxpx80cspncfc3nlz047nryfbv8xzfz5811p19k7jb";
   };
+  patchPhase = ''
+    cp ${cmake}/share/cmake-${cmake.majorVersion}/Modules/FindQt4.cmake cmake/modules
+  '';
   buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
   meta = {
     description = "KDE PIM Storage Service";
diff --git a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix
index 34cbe36b5da..3e352b1f027 100644
--- a/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix
+++ b/pkgs/desktops/kde-4.4/support/qimageblitz/default.nix
@@ -6,6 +6,10 @@ stdenv.mkDerivation {
     url = mirror://sourceforge/qimageblitz/qimageblitz-0.0.4.tar.bz2;
     md5 = "cb87c7f1c0455e8984ee4830f1e749cf";
   };
+  patchPhase = ''
+    cp ${cmake}/share/cmake-${cmake.majorVersion}/Modules/FindQt4.cmake cmake/modules
+  '';
+  patches = [ ../../libs/findqt4.patch ];
   buildInputs = [ cmake qt4 ];
   meta = {
     description = "Graphical effect and filter library for KDE4";