From b86b1b81f575415e9f6094313f8af2458484eccd Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Fri, 23 Aug 2013 19:00:28 +0300 Subject: [PATCH] Calligra: update to 2.7.2 --- pkgs/applications/office/calligra/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 1b692586e0c8..137e7be019fa 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,24 +1,33 @@ { stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa , kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 -, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }: +, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular +, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase + }: stdenv.mkDerivation rec { - name = "calligra-2.5.5"; + name = "calligra-2.7.2"; src = fetchurl { - url = "mirror://kde/stable/${name}/${name}.tar.bz2"; - sha256 = "0h9idadrcyjvd0mkwri4lg310mzpna6s0pvc7b7r3267wzjbn9kw"; + url = "mirror://kde/stable/${name}/${name}.tar.xz"; + sha256 = "1awnvv62fp5bjhi6fys37s6lpzxaig4v15m1zjlgxq82ig61w6sq"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; - patches = [ ./fix-kde4.10-build.patch ]; +# patches = [ ./fix-kde4.10-build.patch ]; + +# TODO: package Vc, libWPS, OCIO, OpenShiva, QtShiva, Spnav, m2mml +# TODO: not found popplerQt4 buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype sqlite icu libwpd libwpg popplerQt4 libkdcraw libxslt fftw glew gsl - shared_desktop_ontologies okular ]; + shared_desktop_ontologies okular + libvisio kactivities mysql postgresql freetds xbase openexr +]; + + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; meta = { description = "A Qt/KDE office suite, formely known as koffice";