5 files changed, 4 insertions, 35 deletions
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index e9838739133..a42b45c76ea 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -39,8 +39,6 @@ recurseIntoAttrs rec {
 
   polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
 
-  strigi = callPackage ./support/strigi { };
-
   soprano = callPackage ./support/soprano { };
 
 ### LIBS
diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix
index 3d882f81bce..bbd6a00e51d 100644
--- a/pkgs/desktops/kde-4.6/default.nix
+++ b/pkgs/desktops/kde-4.6/default.nix
@@ -38,8 +38,6 @@ rec {
 
   polkit_qt_1 = callPackage ./support/polkit-qt-1 { };
 
-  strigi = callPackage ./support/strigi { };
-
   soprano = callPackage ./support/soprano { };
 
 ### LIBS
diff --git a/pkgs/desktops/kde-4.6/support/strigi/default.nix b/pkgs/desktops/kde-4.6/support/strigi/default.nix
deleted file mode 100644
index 7a4cb3b664c..00000000000
--- a/pkgs/desktops/kde-4.6/support/strigi/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
-, cluceneCore
-}:
-
-stdenv.mkDerivation rec {
-  name = "strigi-${version}";
-  version = "0.7.2";
-
-  src = fetchurl {
-    url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2";
-    sha256 = "1f1ac27cjm5m4iwsgvd7nylr0md0a95przkbpsdq7l90wjxj390w";
-  };
-  includeAllQtDirs=true;
-  
-  CLUCENE_HOME = cluceneCore;
-  
-  # Dependencies such as SQLite and FAM are unreliable in this release
-  buildInputs = [
-    cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore
-  ];
-
-  meta = {
-    homepage = http://strigi.sourceforge.net;
-    description = "A very fast and efficient crawler to index data on your harddrive";
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    inherit (qt4.meta) platforms;
-  };
-}
diff --git a/pkgs/desktops/kde-4.5/support/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix
index 7a4cb3b664c..eeed7b271cd 100644
--- a/pkgs/desktops/kde-4.5/support/strigi/default.nix
+++ b/pkgs/development/libraries/strigi/default.nix
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1f1ac27cjm5m4iwsgvd7nylr0md0a95przkbpsdq7l90wjxj390w";
   };
   includeAllQtDirs=true;
-  
+
   CLUCENE_HOME = cluceneCore;
-  
+
   # Dependencies such as SQLite and FAM are unreliable in this release
   buildInputs = [
     cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7a5981256c..0292338d076 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4111,6 +4111,8 @@ let
 
   stlport = callPackage ../development/libraries/stlport { };
 
+  strigi = callPackage ../development/libraries/strigi {};
+
   suitesparse = callPackage ../development/libraries/suitesparse { };
 
   sword = callPackage ../development/libraries/sword { };