diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix
index 3901cd71e2f..aab3524fbee 100644
--- a/pkgs/desktops/kde-4.3/default.nix
+++ b/pkgs/desktops/kde-4.3/default.nix
@@ -3,46 +3,46 @@ pkgs:
rec {
### SUPPORT
automoc4 = import ./support/automoc4 {
- inherit (pkgs) stdenv fetchurl cmake;
+ inherit (pkgs) stdenv fetchurl lib cmake;
inherit (pkgs) qt4;
};
phonon = import ./support/phonon {
- inherit (pkgs) stdenv fetchurl cmake;
+ inherit (pkgs) stdenv fetchurl lib cmake;
inherit (pkgs) qt4 pthread_stubs gst_all xineLib;
inherit (pkgs.xlibs) libXau libXdmcp;
inherit automoc4;
};
strigi = import ./support/strigi {
- inherit (pkgs) stdenv fetchurl cmake perl;
- inherit (pkgs) bzip2 qt4 libxml2 exiv2 fam log4cxx cluceneCore;
+ inherit (pkgs) stdenv fetchurl lib cmake perl;
+ inherit (pkgs) bzip2 qt4 libxml2 expat exiv2 cluceneCore;
};
soprano = import ./support/soprano {
- inherit (pkgs) stdenv fetchurl cmake;
- inherit (pkgs) qt4 jdk cluceneCore redland;
+ inherit (pkgs) stdenv fetchurl lib cmake;
+ inherit (pkgs) qt4 cluceneCore redland;
};
qimageblitz = import ./support/qimageblitz {
- inherit (pkgs) stdenv fetchurl cmake qt4;
+ inherit (pkgs) stdenv fetchurl lib cmake qt4;
};
qca2 = import ./support/qca2 {
- inherit (pkgs) stdenv fetchurl which qt4;
+ inherit (pkgs) stdenv fetchurl lib which qt4;
};
akonadi = import ./support/akonadi {
- inherit (pkgs) stdenv fetchurl cmake qt4 shared_mime_info libxslt boost mysql;
- inherit automoc4;
+ inherit (pkgs) stdenv fetchurl lib cmake qt4 shared_mime_info libxslt boost mysql;
+ inherit automoc4 soprano;
};
decibel = import ./support/decibel {
- inherit (pkgs) stdenv fetchurl cmake qt4 tapioca_qt telepathy_qt dbus;
+ inherit (pkgs) stdenv fetchurl lib cmake qt4 tapioca_qt telepathy_qt;
};
eigen = import ./support/eigen {
- inherit (pkgs) stdenv fetchurl cmake;
+ inherit (pkgs) stdenv fetchurl lib cmake;
};
### LIBS
diff --git a/pkgs/desktops/kde-4.3/support/akonadi/default.nix b/pkgs/desktops/kde-4.3/support/akonadi/default.nix
index 9ed2c55323c..04d1e8caaa7 100644
--- a/pkgs/desktops/kde-4.3/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.3/support/akonadi/default.nix
@@ -1,11 +1,17 @@
-{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4}:
+{stdenv, fetchurl, lib, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
stdenv.mkDerivation {
- name = "akonadi-1.2.0";
+ name = "akonadi-1.2.1";
src = fetchurl {
- url = http://download.akonadi-project.org/akonadi-1.2.0.tar.bz2;
- sha256 = "16kx5pfkspaz5000sz9f85xnk33xpssk6ym9wz5z6n3scihwhn6g";
+ url = http://download.akonadi-project.org/akonadi-1.2.1.tar.bz2;
+ sha256 = "ee2bd0802d8202652388dd78959628716968f974b8f254de7055a0d74cba2134";
};
includeAllQtDirs=true;
- buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 ];
+ buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
+ meta = {
+ description = "KDE PIM Storage Service";
+ license = "LGPL";
+ homepage = http://pim.kde.org/akonadi;
+ maintainers = [ lib.maintainers.sander ];
+ };
}
diff --git a/pkgs/desktops/kde-4.3/support/automoc4/default.nix b/pkgs/desktops/kde-4.3/support/automoc4/default.nix
index 6feeace953b..bd6c5c3b149 100644
--- a/pkgs/desktops/kde-4.3/support/automoc4/default.nix
+++ b/pkgs/desktops/kde-4.3/support/automoc4/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, cmake
-, qt4}:
+{stdenv, fetchurl, lib, cmake, qt4}:
stdenv.mkDerivation {
name = "automoc4-0.9.88";
@@ -8,4 +7,9 @@ stdenv.mkDerivation {
md5 = "91bf517cb940109180ecd07bc90c69ec";
};
buildInputs = [ cmake qt4 ];
+ meta = {
+ description = "KDE Meta Object Compiler";
+ license = "BSD";
+ maintainers = [ lib.maintainers.sander ];
+ };
}
diff --git a/pkgs/desktops/kde-4.3/support/decibel/default.nix b/pkgs/desktops/kde-4.3/support/decibel/default.nix
index dab71739f6a..ad6eaa98fe9 100644
--- a/pkgs/desktops/kde-4.3/support/decibel/default.nix
+++ b/pkgs/desktops/kde-4.3/support/decibel/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, qt4, tapioca_qt, telepathy_qt}:
+{stdenv, fetchurl, lib, cmake, qt4, tapioca_qt, telepathy_qt}:
stdenv.mkDerivation {
name = "decibel-0.5.0";
@@ -7,4 +7,10 @@ stdenv.mkDerivation {
md5 = "7de299ace568c87a746388ad765228e5";
};
buildInputs = [ cmake qt4 tapioca_qt telepathy_qt ];
+ meta = {
+ description = "Realtime communications framework for KDE";
+ license = "LGPL";
+ homepage = http://decibel.kde.org;
+ maintainers = [ lib.maintainers.sander ];
+ };
}
diff --git a/pkgs/desktops/kde-4.3/support/eigen/default.nix b/pkgs/desktops/kde-4.3/support/eigen/default.nix
index 8ad17db3e04..55f59800b04 100644
--- a/pkgs/desktops/kde-4.3/support/eigen/default.nix
+++ b/pkgs/desktops/kde-4.3/support/eigen/default.nix
@@ -1,10 +1,16 @@
-{stdenv, fetchurl, cmake}:
+{stdenv, fetchurl, lib, cmake}:
stdenv.mkDerivation {
- name = "eigen-2.0.0";
+ name = "eigen-2.0.5";
src = fetchurl {
- url = http://download.tuxfamily.org/eigen/eigen-2.0.0.tar.bz2;
- md5 = "bedfe344498b926a4b5db17d2846dbb5";
+ url = http://bitbucket.org/eigen/eigen2/get/2.0.5.tar.bz2;
+ sha256 = "0wzixg09fh0vmn8sh2vcdn3j1pxhvd2k2axmpr0vjss98aapvqgf";
};
buildInputs = [ cmake ];
+ meta = {
+ description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
+ license = "LGPL";
+ homepage = http://eigen.tuxfamily.org;
+ maintainers = [ lib.maintainers.sander ];
+ };
}
diff --git a/pkgs/desktops/kde-4.3/support/phonon/default.nix b/pkgs/desktops/kde-4.3/support/phonon/default.nix
index 27a6f42b3f1..667e64287f5 100644
--- a/pkgs/desktops/kde-4.3/support/phonon/default.nix
+++ b/pkgs/desktops/kde-4.3/support/phonon/default.nix
@@ -1,8 +1,6 @@
-{ stdenv, fetchurl, cmake
-, libXau, libXdmcp
-, qt4, pthread_stubs
-, gst_all, xineLib
-, automoc4}:
+{ stdenv, fetchurl, lib, cmake, qt4
+, libXau, libXdmcp, pthread_stubs
+, gst_all, xineLib, automoc4}:
stdenv.mkDerivation {
name = "phonon-4.3.1";
@@ -11,8 +9,12 @@ stdenv.mkDerivation {
sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c";
};
includeAllQtDirs = true;
- buildInputs = [ cmake
- libXau libXdmcp
- qt4 pthread_stubs gst_all.gstreamer gst_all.gstPluginsBase xineLib
- automoc4 ];
+ buildInputs = [ cmake qt4 libXau libXdmcp pthread_stubs gst_all.gstreamer gst_all.gstPluginsBase xineLib automoc4 ];
+ meta = {
+ description = "KDE Multimedia API";
+ longDescription = "KDE Multimedia API which abstracts over various backends such as GStreamer and Xine";
+ license = "LGPL";
+ homepage = http://phonon.kde.org;
+ maintainers = [ lib.maintainers.sander ];
+ };
}
diff --git a/pkgs/desktops/kde-4.3/support/qca2/default.nix b/pkgs/desktops/kde-4.3/support/qca2/default.nix
index d54c3acd69f..0213cb5ca32 100644
--- a/pkgs/desktops/kde-4.3/support/qca2/default.nix
+++ b/pkgs/desktops/kde-4.3/support/qca2/default.nix
@@ -1,10 +1,16 @@
-{stdenv, fetchurl, which, qt4}:
+{stdenv, fetchurl, lib, which, qt4}:
stdenv.mkDerivation {
name = "qca-2.0.1";
src = fetchurl {
- url = http://delta.affinix.com/download/qca/2.0/qca-2.0.1.tar.bz2;
- md5 = "a0a87d0b3210e23f8c1713562282b7d6";
+ url = http://delta.affinix.com/download/qca/2.0/qca-2.0.2.tar.bz2;
+ sha256 = "49b5474450104a2298747c243de1451ab7a6aeed4bf7df43ffa4b7128a2837b8";
};
buildInputs = [ which qt4 ];
+ meta = {
+ description = "Qt Cryptographic Architecture";
+ license = "LGPL";
+ homepage = http://delta.affinix.com/qca;
+ maintainers = [ lib.maintainers.sander ];
+ };
}
diff --git a/pkgs/desktops/kde-4.3/support/qimageblitz/default.nix b/pkgs/desktops/kde-4.3/support/qimageblitz/default.nix
index e5fb050ebaa..991dfc4a3b2 100644
--- a/pkgs/desktops/kde-4.3/support/qimageblitz/default.nix
+++ b/pkgs/desktops/kde-4.3/support/qimageblitz/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, qt4}:
+{stdenv, fetchurl, lib, cmake, qt4}:
stdenv.mkDerivation {
name = "qimageblitz-0.0.4";
@@ -8,4 +8,10 @@ stdenv.mkDerivation {
};
includeAllQtDirs = true;
buildInputs = [ cmake qt4 ];
+ meta = {
+ description = "Graphical effect and filter library for KDE4";
+ license = "BSD";
+ homepage = http://qimageblitz.sourceforge.net;
+ maintainers = [ lib.maintainers.sander ];
+ };
}
diff --git a/pkgs/desktops/kde-4.3/support/soprano/default.nix b/pkgs/desktops/kde-4.3/support/soprano/default.nix
index a19270e939a..c684d2c2b0e 100644
--- a/pkgs/desktops/kde-4.3/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.3/support/soprano/default.nix
@@ -1,19 +1,20 @@
-{stdenv, fetchurl, cmake, qt4, jdk, cluceneCore, redland}:
+{stdenv, fetchurl, lib, cmake, qt4, cluceneCore, redland}:
stdenv.mkDerivation {
name = "soprano-2.2.3";
src = fetchurl {
- url = mirror://sourceforge/soprano/soprano-2.2.3.tar.bz2;
- md5 = "22c992a252144ae0a3a964ba2f6f1933";
+ url = mirror://sourceforge/soprano/soprano-2.3.0.tar.bz2;
+ sha256 = "8a563a5a4b00169ef84fb1b69e76d3657ee7f5a94a6a35c9600f510f55fa275c";
};
- #JAVA_HOME=jdk;
-
- buildInputs = [ cmake qt4 /* jdk */ cluceneCore redland ];
+ # We disable the Java backends, since we do not need them and they make the closure size much bigger
+ buildInputs = [ cmake qt4 cluceneCore redland ];
meta = {
homepage = http://soprano.sourceforge.net/;
description = "An object-oriented C++/Qt4 framework for RDF data";
+ license = "LGPL";
+ maintainers = [ lib.maintainers.sander ];
};
}
diff --git a/pkgs/desktops/kde-4.3/support/strigi/default.nix b/pkgs/desktops/kde-4.3/support/strigi/default.nix
index e95556d0eb3..29bfeb095c5 100644
--- a/pkgs/desktops/kde-4.3/support/strigi/default.nix
+++ b/pkgs/desktops/kde-4.3/support/strigi/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, cmake, perl, bzip2, qt4, libxml2, exiv2, fam
-, log4cxx, cluceneCore
+{ stdenv, fetchurl, lib, cmake, qt4, perl, bzip2, libxml2, expat, exiv2
+, cluceneCore
}:
stdenv.mkDerivation {
@@ -14,12 +14,15 @@ stdenv.mkDerivation {
CLUCENE_HOME = cluceneCore;
+ # Dependencies such as SQLite and FAM are unreliable in this release
buildInputs = [
- cmake perl bzip2 stdenv.gcc.libc qt4 libxml2 exiv2 fam /* log4cxx */ cluceneCore
+ cmake perl qt4 bzip2 stdenv.gcc.libc libxml2 expat exiv2 cluceneCore
];
meta = {
- homepage = http://strigi.sourceforge.net/;
+ homepage = http://strigi.sourceforge.net;
description = "A very fast and efficient crawler to index data on your harddrive";
+ license = "LGPL";
+ maintainers = [ lib.maintainers.sander ];
};
}