ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

Fix akonadi startup failure.

Browse Source 
Patch akonadiserver so as to correct the datadir parameter passed to
mysql. Without this patch akonadiserver in KDE 4.4.5 would not start and
consequently kmail would crash during start up.

svn path=/nixpkgs/trunk/; revision=23154
This commit is contained in:
Peter Simons 2010-08-12 14:58:02 +00:00
parent 9be0b9fea6
commit b42dfe40ec
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/desktops/kde-4.4/support/akonadi/default.nix
View File

@ -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";

17
pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch Normal file
View File

@ -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