public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calligra: 2.8.7 -> 2.9.8

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-11-04 23:07:41 +03:00
parent 997bf2c665
commit b052cb1a10
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/applications/office/calligra/default.nix
View File

@ -1,36 +1,32 @@
{ stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen
, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2 , exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4 , libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular , freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase , kactivities, okular, git
, libodfgen, opencolorio, openjpeg, pstoedit, librevenge # TODO: not found
#, xbase, openjpeg
# TODO: package libWPS, Spnav, m2mml, LibEtonyek
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calligra-2.8.7"; name = "calligra-2.9.8";
src = fetchurl { src = fetchurl {
url = "mirror://kde/stable/${name}/${name}.tar.xz"; url = "mirror://kde/stable/${name}/${name}.tar.xz";
sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; sha256 = "08a5k8gjmzp9yzq46xy0p1sw7dpvxmxh8zz6dyj8q1dq29719kkc";
}; };
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
# TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers
# not found: xbase, openjpeg(too new)
buildInputs = [ buildInputs = [
kdelibs attica zlib libpng boost mesa kdepimlibs kdelibs lcms2 libpng eigen
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
shared_desktop_ontologies okular libodfgen opencolorio openjpeg freetds fftw glew libkdcraw pstoedit opencolorio kdepimlibs
libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit kactivities okular git
librevenge
]; ];
patches = [ ./librevenge.patch ]; enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
meta = { meta = {
description = "A suite of productivity applications"; description = "A suite of productivity applications";

4
pkgs/top-level/all-packages.nix
View File

@ -14201,7 +14201,9 @@ let
bluedevil = callPackage ../tools/bluetooth/bluedevil { }; 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 { }; choqok = callPackage ../applications/networking/instant-messengers/choqok { };