From 50de8e181fd7b9a57e595c1f4605eff4e0fb1618 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 7 Jan 2012 00:02:28 +0000
Subject: [PATCH] Fix kde48.kdelibs evaluation error

Will write kactivities.nix when hydra will build kde48.kdelibs

svn path=/nixpkgs/trunk/; revision=31388
---
 pkgs/desktops/kde-4.8/kde-package/4.7.97.nix      | 8 +-------
 pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh | 1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
index f793597544ee..8a8057082767 100644
--- a/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
+++ b/pkgs/desktops/kde-4.8/kde-package/4.7.97.nix
@@ -116,13 +116,6 @@ modules=[
     { name="svgpart";  }
   ];
 }
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kactivities";  }
-  ];
-}
 {
   module="kdeutils";
   split=true;
@@ -208,6 +201,7 @@ sane="kde_baseapps";  split=true;
     { name="konsole";  }
   ];
 }
+{ module="kactivities";  split=false;}
 { module="kdeadmin";  split=false;
   pkgs=[
     { name="strigi-analyzer"; sane="strigi_analyzer";}
diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
index 910394fb6a33..ef8189cb7c53 100755
--- a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
@@ -34,6 +34,7 @@ fi
 eval `xsltproc kde-submodules.xslt kde_projects.xml`
 
 module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
 
 print_sane() {
   echo "Called print_sane $1" >&2