Author: simons
Date: Thu Aug 12 14:58:02 2010
New Revision: 23154
URL: https://svn.nixos.org/websvn/nix/?rev=23154&sc=1
Log:
Fix akonadi startup failure.
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.
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix Thu Aug
12 14:57:15 2010 (r23153)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/default.nix Thu Aug
12 14:58:02 2010 (r23154)
@@ -6,6 +6,7 @@
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";
Added:
nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/desktops/kde-4.4/support/akonadi/fix-broken-datadir-parameter.patch
Thu Aug 12 14:58:02 2010 (r23154)
@@ -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
+
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
