From ef041b7aa373c03433d5b730096af3ab321cff1d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Jul 2011 11:56:11 +0000
Subject: [PATCH] * Hack to fix evaluation.

svn path=/nixpkgs/branches/kde-4.7/; revision=27869
---
 pkgs/desktops/kde-4.7/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix
index dc32da95f63..153b894e045 100644
--- a/pkgs/desktops/kde-4.7/default.nix
+++ b/pkgs/desktops/kde-4.7/default.nix
@@ -48,7 +48,7 @@ recurseIntoAttrs rec {
 
   kdelibs = callPackage ./libs { };
 
-  kdepimlibs = callPackage ./pimlibs { };
+  #kdepimlibs = callPackage ./pimlibs { };
 
 ### BASE
 
@@ -79,6 +79,7 @@ recurseIntoAttrs rec {
 
   kde_wallpapers = callPackage ./wallpapers.nix { };
 
+  /*
   kdeaccessibility = combinePkgs "kdeaccessibility" {
     colorSchemes = callPackage ./accessibility/color-schemes.nix { };
     iconThemes = callPackage ./accessibility/icon-themes.nix { };
@@ -165,9 +166,11 @@ recurseIntoAttrs rec {
 
   kdepim_runtime = callPackage ./pim-runtime { };
   kdepim = callPackage ./pim { };
+  */
 
 ### DEVELOPMENT
 
+  /*
   kdebindings = callPackage ./bindings { };
 
   l10n = callPackage ./l10n { inherit release; };
@@ -175,5 +178,6 @@ recurseIntoAttrs rec {
   # Make the split packages visible to `nix-env -q'.
   misc = recurseIntoAttrs
     (kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs);
+  */
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25219e18ef0..e1194a077a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3001,6 +3001,8 @@ let
 
   clucene_core = callPackage ../development/libraries/clucene-core { };
 
+  cluceneCore = clucene_core; # !!! remove this
+
   clutter = callPackage ../development/libraries/clutter {
     inherit (gnome) glib pango gtk;
   };