From 9aeb2cdc2b8c50d1ef2cc1e6afde06f5ac8c2148 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 11 Jan 2015 17:02:13 +0200 Subject: calligra: fix dependencies, and add several new ones --- pkgs/applications/office/calligra/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/office/calligra/default.nix') diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 4465c8690e1..ac3072f62b5 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -3,6 +3,7 @@ , fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, popplerQt4 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular , libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase +, libodfgen, opencolorio, openjpeg, pstoedit, librevenge }: stdenv.mkDerivation rec { @@ -15,17 +16,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkgconfig ]; -# patches = [ ./fix-kde4.10-build.patch ]; - -# TODO: package Vc, libWPS, OCIO, OpenShiva, QtShiva, Spnav, m2mml -# TODO: not found popplerQt4 +# 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 popplerQt4 libkdcraw libxslt fftw glew gsl - shared_desktop_ontologies okular - libvisio kactivities mysql postgresql freetds xbase openexr -]; + shared_desktop_ontologies okular libodfgen opencolorio openjpeg + libvisio kactivities mysql postgresql freetds xbase openexr pstoedit + librevenge + ]; + + patches = [ ./librevenge.patch ]; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; -- cgit 1.4.1