akonadi-1.4.3

svn path=/nixpkgs/trunk/; revision=25860
This commit is contained in:
Yury G. Kudryashov 2011-02-09 21:09:10 +00:00
parent 2e92a0cd12
commit cd42c8087e
2 changed files with 3 additions and 4 deletions

View file

@ -1,14 +1,13 @@
{stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, mysql, automoc4, soprano}:
stdenv.mkDerivation rec {
name = "akonadi-1.4.0";
name = "akonadi-1.4.3";
src = fetchurl {
url = "http://download.akonadi-project.org/${name}.tar.bz2";
sha256 = "199fh5yqygr0xdwcnjqqms8vskigbzvwb3071r979606rrsnpnl5";
sha256 = "18xi66w78lsf2jf1z1vl8abps9hdv3g5msw6q1kj6xhmn4lbgjkk";
};
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; {
description = "KDE PIM Storage Service";
license = "LGPL";

View file

@ -9,7 +9,7 @@ Fix broken datadir parameter.
+ 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 );
arguments << QString::fromLatin1( "--socket=%1/mysql.socket" ).arg( socketDirectory );
#else
- arguments << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
arguments << QString::fromLatin1( "--shared-memory" );