public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix broken datadir in 4.5.0 as well

Browse Source 
svn path=/nixpkgs/trunk/; revision=23261
This commit is contained in:
Yury G. Kudryashov 2010-08-19 22:52:00 +00:00
parent c8b7ed425b
commit e16427a899
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.5/support/akonadi/default.nix
View File

@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5"; sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5";
}; };
buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ];
patches = [ ./fix-broken-datadir-parameter.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "KDE PIM Storage Service"; description = "KDE PIM Storage Service";
license = "LGPL"; license = "LGPL";

17
pkgs/desktops/kde-4.5/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