diff --git a/pkgs/desktops/kde-4.4/support/akonadi/default.nix b/pkgs/desktops/kde-4.4/support/akonadi/default.nix index 1f00d0461b9..b93f65b9a6a 100644 --- a/pkgs/desktops/kde-4.4/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.4/support/akonadi/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { url = "http://download.akonadi-project.org/${name}.tar.bz2"; sha256 = "1d2ancspavp4qg717hj56j1likb0ifdr65q1awbc2ghqqgd9znck"; }; + patches = [ ./fix-broken-datadir-parameter.patch ]; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; meta = with stdenv.lib; { description = "KDE PIM Storage Service"; diff --git a/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch new file mode 100644 index 00000000000..fa33329d4b0 --- /dev/null +++ b/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch @@ -0,0 +1,17 @@ +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 +