diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 3d1eada1db61..d1f1cc2f03fa 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -1,36 +1,32 @@ -{ stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa -, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 -, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 -, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular -, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase -, libodfgen, opencolorio, openjpeg, pstoedit, librevenge +{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen +, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg +, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql +, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs +, kactivities, okular, git +# TODO: not found +#, xbase, openjpeg +# TODO: package libWPS, Spnav, m2mml, LibEtonyek }: stdenv.mkDerivation rec { - name = "calligra-2.8.7"; + name = "calligra-2.9.8"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; + sha256 = "08a5k8gjmzp9yzq46xy0p1sw7dpvxmxh8zz6dyj8q1dq29719kkc"; }; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; -# TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers -# not found: xbase, openjpeg(too new) - buildInputs = [ - kdelibs attica zlib libpng boost mesa kdepimlibs - createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype - sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl - shared_desktop_ontologies okular libodfgen opencolorio openjpeg - libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit - librevenge + kdelibs lcms2 libpng eigen + exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg + libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql + freetds fftw glew libkdcraw pstoedit opencolorio kdepimlibs + kactivities okular git ]; - patches = [ ./librevenge.patch ]; - - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + enableParallelBuilding = true; meta = { description = "A suite of productivity applications"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9aca437fb43c..ed176ef4de84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14201,7 +14201,9 @@ let bluedevil = callPackage ../tools/bluetooth/bluedevil { }; - calligra = callPackage ../applications/office/calligra { eigen = eigen2; }; + calligra = callPackage ../applications/office/calligra { + vc = vc_0_7; + }; choqok = callPackage ../applications/networking/instant-messengers/choqok { };