* Akonadi updated to 1.6.0.

svn path=/nixpkgs/branches/kde-4.7/; revision=27768
This commit is contained in:
Eelco Dolstra 2011-07-13 18:15:57 +00:00
parent a90c3142ee
commit 71c508f641
3 changed files with 13 additions and 26 deletions

View File

@ -1,13 +1,17 @@
{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "akonadi-1.4.3"; name = "akonadi-1.6.0";
src = fetchurl { src = fetchurl {
url = "http://download.akonadi-project.org/${name}.tar.bz2"; url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
sha256 = "18xi66w78lsf2jf1z1vl8abps9hdv3g5msw6q1kj6xhmn4lbgjkk"; sha256 = "0bzr6476yyinvdhrn9z8ynmi0py9zs3dfhwk3dvqxysk87svk71f";
}; };
buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
patches = [ ./fix-broken-datadir-parameter.patch ]; buildInputs = [ cmake qt4 soprano automoc4 shared_mime_info libxslt boost ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "KDE PIM Storage Service"; description = "KDE PIM Storage Service";
license = "LGPL"; license = "LGPL";

View File

@ -1,17 +0,0 @@
Fix broken datadir parameter.
--- akonadi-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-06-09 03:41:30.000000000 -0430
+++ akonadi-local-1.3.85/server/src/storage/dbconfigmysql.cpp 2010-08-11 00:21:20.547181479 -0430
@@ -250,11 +250,10 @@
// synthesize the mysqld command
QStringList arguments;
arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir );
+ arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
#ifndef Q_WS_WIN
- arguments << QString::fromLatin1( "--datadir" ) << QString::fromLatin1( "%1/" ).arg( dataDir );
arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( socketDirectory );
#else
- arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
arguments << QString::fromLatin1( "--shared-memory" );
#endif

View File

@ -1,6 +1,6 @@
{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
, libusb, libxklavier, perl, python , libusb, libxklavier, perl, python, libqalculate, akonadi
}: }:
kde.package { kde.package {
@ -10,14 +10,14 @@ kde.package {
xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXcomposite xorg.libXdamage xorg.libXau
soprano shared_desktop_ontologies lm_sensors pciutils libraw1394 soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libusb python libqalculate akonadi
]; ];
# Workaround for undefined reference to `dlsym' in kwinglutils_funcs.cpp. # Workaround for undefined reference to `dlsym' in kwinglutils_funcs.cpp.
NIX_LDFLAGS = "-ldl"; NIX_LDFLAGS = "-ldl";
meta = { meta = {
description = "KDE desktop environment workspace components"; description = "KDE workspace components such as Plasma, Kwin and System Settings";
license = "GPLv2"; license = "GPLv2";
kde.name = "kde-workspace"; kde.name = "kde-workspace";
}; };