ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

akonadi-1.4.90

Browse Source 
svn path=/nixpkgs/trunk/; revision=25285
This commit is contained in:
Yury G. Kudryashov 2010-12-26 15:27:20 +00:00
parent b0cbe093ba
commit 4f140371a5
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/kde-4.6/support/akonadi/default.nix
View File

@ -1,14 +1,12 @@
{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}: {stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "akonadi-1.4.0"; name = "akonadi-1.4.90";
src = fetchurl { src = fetchurl {
url = "http://download.akonadi-project.org/${name}.tar.bz2"; url = "http://download.akonadi-project.org/${name}.tar.bz2";
sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5"; sha256 = "0am4m81zhq343a42s1ig5jxx47i6g1d97r546qqzdm5w542r6c00";
}; };
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 ];
postPatch = "sed -e '/Q_ASSERT.*SQLITE/d' -i qsqlite/src/qsql_sqlite.cpp";
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.6/support/akonadi/fix-broken-datadir-parameter.patch
View File

@ -1,17 +0,0 @@
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