diff --git a/pkgs/desktops/kde-4.6/support/akonadi/default.nix b/pkgs/desktops/kde-4.6/support/akonadi/default.nix index 9e516947e833..ff4f1c15d591 100644 --- a/pkgs/desktops/kde-4.6/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.6/support/akonadi/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: stdenv.mkDerivation rec { - name = "akonadi-1.4.0"; + name = "akonadi-1.4.90"; src = fetchurl { url = "http://download.akonadi-project.org/${name}.tar.bz2"; - sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5"; + sha256 = "0am4m81zhq343a42s1ig5jxx47i6g1d97r546qqzdm5w542r6c00"; }; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; - patches = [ ./fix-broken-datadir-parameter.patch ]; - postPatch = "sed -e '/Q_ASSERT.*SQLITE/d' -i qsqlite/src/qsql_sqlite.cpp"; meta = with stdenv.lib; { description = "KDE PIM Storage Service"; license = "LGPL"; diff --git a/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch deleted file mode 100644 index fa33329d4b0f..000000000000 --- a/pkgs/desktops/kde-4.6/support/akonadi/fix-broken-datadir-parameter.patch +++ /dev/null @@ -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( miscDir ); - #else -- arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); - arguments << QString::fromLatin1( "--shared-memory" ); - #endif -