Author: urkud
Date: Wed Feb 9 21:09:10 2011
New Revision: 25860
URL: https://svn.nixos.org/websvn/nix/?rev=25860&sc=1
Log:
akonadi-1.4.3
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix Wed Feb
9 21:08:53 2011 (r25859)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/default.nix Wed Feb
9 21:09:10 2011 (r25860)
@@ -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";
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch
==============================================================================
---
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch
Wed Feb 9 21:08:53 2011 (r25859)
+++
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/akonadi/fix-broken-datadir-parameter.patch
Wed Feb 9 21:09:10 2011 (r25860)
@@ -9,7 +9,7 @@
+ 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" );
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
