From e16427a899e6e23cc2b2aa5e50916ebc048e84a1 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 19 Aug 2010 22:52:00 +0000 Subject: [PATCH] Fix broken datadir in 4.5.0 as well svn path=/nixpkgs/trunk/; revision=23261 --- .../kde-4.5/support/akonadi/default.nix | 1 + .../akonadi/fix-broken-datadir-parameter.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch diff --git a/pkgs/desktops/kde-4.5/support/akonadi/default.nix b/pkgs/desktops/kde-4.5/support/akonadi/default.nix index 5ef0fcb183c..0d6e4dc3e65 100644 --- a/pkgs/desktops/kde-4.5/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.5/support/akonadi/default.nix @@ -7,6 +7,7 @@ stdenv.mkDerivation rec { sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5"; }; buildInputs = [ cmake qt4 shared_mime_info libxslt boost mysql automoc4 soprano ]; + patches = [ ./fix-broken-datadir-parameter.patch ]; meta = with stdenv.lib; { description = "KDE PIM Storage Service"; license = "LGPL"; diff --git a/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch b/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch new file mode 100644 index 00000000000..fa33329d4b0 --- /dev/null +++ b/pkgs/desktops/kde-4.5/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 +