diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-02-09 21:09:10 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-02-09 21:09:10 +0000 |
| commit | cd42c8087ed2df5da31762b1e7f607c79788f80d (patch) | |
| tree | 7afa7ecd751173ac30489a4a672539f9a5288c09 /pkgs | |
| parent | 2e92a0cd126dc1ab06e9853c2919036d6026a633 (diff) | |
| download | nixpkgs-cd42c8087ed2df5da31762b1e7f607c79788f80d.tar nixpkgs-cd42c8087ed2df5da31762b1e7f607c79788f80d.tar.gz nixpkgs-cd42c8087ed2df5da31762b1e7f607c79788f80d.tar.bz2 nixpkgs-cd42c8087ed2df5da31762b1e7f607c79788f80d.tar.lz nixpkgs-cd42c8087ed2df5da31762b1e7f607c79788f80d.tar.xz nixpkgs-cd42c8087ed2df5da31762b1e7f607c79788f80d.tar.zst nixpkgs-cd42c8087ed2df5da31762b1e7f607c79788f80d.zip | |
akonadi-1.4.3
svn path=/nixpkgs/trunk/; revision=25860
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-4.5/support/akonadi/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.5/support/akonadi/default.nix b/pkgs/desktops/kde-4.5/support/akonadi/default.nix index 9e516947e83..eedd6b9f6e8 100644 --- a/pkgs/desktops/kde-4.5/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.5/support/akonadi/default.nix @@ -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"; 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 index fa33329d4b0..09b594f4e21 100644 --- 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 @@ -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" ); |