From 695b1508447e2462a0c246f8d764f41b96e7cf99 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 2 Aug 2010 17:12:39 +0000
Subject: [PATCH] Add polkit-qt-1, strigi, kdelibs-4.4.92

svn path=/nixpkgs/trunk/; revision=22890
---
 pkgs/desktops/kde-4.5/default.nix             | 19 ++++++++++
 pkgs/desktops/kde-4.5/libs/default.nix        | 38 +++++++++++++++++++
 .../kde-4.5/support/polkit-qt-1/default.nix   | 13 +++++++
 .../kde-4.5/support/strigi/default.nix        | 27 +++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-4.5/libs/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
 create mode 100644 pkgs/desktops/kde-4.5/support/strigi/default.nix

diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 8dbafea2b635..a002e98e758f 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -14,6 +14,16 @@ pkgs.recurseIntoAttrs (rec {
     inherit automoc4;
   };
 
+  polkit_qt_1 = import ./support/polkit-qt-1 {
+    inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 glib polkit;
+	inherit automoc4;
+  };
+
+  strigi = import ./support/strigi {
+    inherit (pkgs) stdenv fetchurl lib cmake perl;
+    inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
+  };
+  
   soprano = import ./support/soprano {
     inherit (pkgs) stdenv fetchurl cmake cluceneCore redland libiodbc qt4;
   };
@@ -37,4 +47,13 @@ pkgs.recurseIntoAttrs (rec {
     inherit qca2;
   };
   
+### LIBS
+  kdelibs = import ./libs {
+    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
+    inherit (pkgs) xz flex bison giflib jasper openexr aspell avahi shared_mime_info
+      kerberos acl attr shared_desktop_ontologies enchant libdbusmenu_qt;
+	inherit (pkgs) docbook_xsl docbook_xml_dtd_42;
+    inherit (pkgs.xlibs) libXScrnSaver;
+    inherit automoc4 phonon strigi soprano qca2 attica polkit_qt_1;
+  };
 })
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
new file mode 100644
index 000000000000..b4f8232d6f01
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, cmake, lib, perl
+, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper
+, xz, flex, bison, openexr, aspell, avahi, kerberos, acl, attr, shared_desktop_ontologies, libXScrnSaver
+, automoc4, phonon, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
+}:
+
+stdenv.mkDerivation rec {
+  name = "kdelibs-4.4.92";
+
+  src = fetchurl {
+    url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
+    sha256 = "03hqn50fls3bpd9xls3bga4g1n4gy1hcxs1dk6wlc2dfklyqshz3";
+  };
+
+  buildInputs = [
+    cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt
+    shared_mime_info giflib jasper /*openexr*/ aspell avahi kerberos acl attr
+    libXScrnSaver enchant libdbusmenu_qt polkit_qt_1
+    automoc4 phonon strigi soprano qca2 attica
+  ];
+
+  propagatedBuildInputs = [ shared_desktop_ontologies stdenv.gcc.libc ];
+
+  # cmake fails to find acl.h because of C++-style comment
+  cmakeFlags = [
+    "-DHAVE_ACL_LIBACL_H=ON" "-DHAVE_SYS_ACL_H=ON"
+    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+    ];
+
+  meta = {
+    description = "KDE libraries";
+    license = "LGPL";
+    homepage = http://www.kde.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
new file mode 100644
index 000000000000..a109c2b6b09a
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }:
+
+stdenv.mkDerivation rec {
+  name = "polkit-qt-1-0.96.1";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
+    sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
+  };
+
+  buildInputs = [ cmake qt4 automoc4 ];
+  propagatedBuildInputs = [ polkit glib ];
+}
diff --git a/pkgs/desktops/kde-4.5/support/strigi/default.nix b/pkgs/desktops/kde-4.5/support/strigi/default.nix
new file mode 100644
index 000000000000..93778e7c9841
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/support/strigi/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
+, cluceneCore
+}:
+
+stdenv.mkDerivation rec {
+  name = "strigi-0.7.1";
+  
+  src = fetchurl {
+    url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2";
+    sha256 = "1cra4jlpd7cdvckwalfjrf2224qvhbkmxdd3sn02q9jhv830b0yi";
+  };
+  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 = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 113624ae28d9..ef91cc97fd6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6580,7 +6580,7 @@ let
   });
 
   kde45 = makeOverridable (import ../desktops/kde-4.5) (pkgs // {
-    openexr = openexr_1_6_1;
+    shared_desktop_ontologies = shared_desktop_ontologies.override { v = "0.5"; };
     stdenv = stdenv2;
   });