kde-4.5 snapshot

svn path=/nixpkgs/trunk/; revision=22892

4 files changed, 39 insertions, 20 deletions

diff --git a/pkgs/desktops/kde-4.5/artwork/default.nix b/pkgs/desktops/kde-4.5/artwork/default.nix
new file mode 100644
index 000000000000..e4e94ebb6dc0
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/artwork/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, lib, cmake, qt4, perl, xscreensaver
+, kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}:
+
+stdenv.mkDerivation {
+  name = "kdeartwork-4.4.92";
+  src = fetchurl {
+    url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
+    sha256 = "17c481za2jfrmhd946jbhgwpcyzjkgjkk2jw84wbj8v694ry3xym";
+  };
+  buildInputs = [ cmake qt4 perl xscreensaver
+                  kdelibs kdebase_workspace automoc4 phonon strigi eigen ];
+  meta = {
+    description = "KDE artwork";
+    longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers";
+    license = "LGPL";
+    homepage = http://www.kde.org;
+    maintainers = [ lib.maintainers.sander ];
+  };
+}
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index d1c427f3e14b..87a159e64b8c 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -21,13 +21,13 @@ pkgs.recurseIntoAttrs (rec {
     inherit (pkgs) stdenv fetchurl cmake;
   };
 
-  phonon = import ./support/phonon {
-    inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio;
-    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
-    inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
-    inherit automoc4;
-  };
-
+#  phonon = import ./support/phonon {
+#    inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 xineLib pulseaudio;
+#    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
+#    inherit (pkgs.xlibs) libXau libXdmcp libpthreadstubs;
+#    inherit automoc4;
+#  };
+#
   polkit_qt_1 = import ./support/polkit-qt-1 {
     inherit (pkgs) stdenv fetchurl cmake pkgconfig qt4 glib polkit;
     inherit automoc4;
@@ -53,17 +53,17 @@ pkgs.recurseIntoAttrs (rec {
 
 ### LIBS
   kdelibs = import ./libs {
-    inherit (pkgs) stdenv fetchurl lib cmake qt4 perl bzip2 pcre fam libxml2 libxslt;
+    inherit (pkgs) stdenv fetchurl 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;
+    inherit automoc4 strigi soprano qca2 attica polkit_qt_1;
   };
 
   kdepimlibs = import ./pimlibs {
     inherit (pkgs) stdenv fetchurl cmake qt4 perl boost cyrus_sasl gpgme libical
       openldap shared_mime_info;
-    inherit kdelibs automoc4 phonon akonadi;
+    inherit kdelibs automoc4 akonadi soprano;
   };
 })
diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix
index b4f8232d6f01..05d37485aad6 100644
--- a/pkgs/desktops/kde-4.5/libs/default.nix
+++ b/pkgs/desktops/kde-4.5/libs/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchurl, cmake, lib, perl
+{ stdenv, fetchurl, cmake, 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
+, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
 }:
 
 stdenv.mkDerivation rec {
-  name = "kdelibs-4.4.92";
+  name = "kdelibs-4.4.95";
 
   src = fetchurl {
-    url = "mirror://kde/unstable/4.4.92/src/${name}.tar.bz2";
-    sha256 = "03hqn50fls3bpd9xls3bga4g1n4gy1hcxs1dk6wlc2dfklyqshz3";
+    url = "mirror://kde/unstable/4.4.95/src/${name}.tar.bz2";
+    sha256 = "1fyjbdbzqxvl7rws4bvra1l4sczc1a72zdin7izif8dyjq6xblj0";
   };
 
   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
+    automoc4 strigi soprano qca2 attica
   ];
 
   propagatedBuildInputs = [ shared_desktop_ontologies stdenv.gcc.libc ];
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
     "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
     ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "KDE libraries";
     license = "LGPL";
     homepage = http://www.kde.org;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ maintainers.sander maintainers.urkud ];
   };
 }
diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix
index 5511b4de88ca..9eb1cec39595 100644
--- a/pkgs/desktops/kde-4.5/pimlibs/default.nix
+++ b/pkgs/desktops/kde-4.5/pimlibs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
-, kdelibs, automoc4, phonon, akonadi}:
+, kdelibs, automoc4, phonon, akonadi, soprano}:
 
 stdenv.mkDerivation rec {
   name = "kdepimlibs-4.4.92";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap
-    shared_mime_info kdelibs automoc4 phonon akonadi ];
+    shared_mime_info kdelibs automoc4 phonon akonadi soprano ];
 
   meta = {
     description = "KDE PIM libraries";