forked from mirrors/nixpkgs
Upgraded koffice to 2.2.0
svn path=/nixpkgs/trunk/; revision=22153
This commit is contained in:
parent
37427ca5db
commit
1e3e2f42a2
|
@ -282,10 +282,10 @@ pkgs.recurseIntoAttrs (rec {
|
|||
};
|
||||
|
||||
koffice = import ./extragear/koffice {
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew;
|
||||
inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd;
|
||||
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib libxml2 libxslt boost glew;
|
||||
inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit automoc4 phonon qimageblitz qca2 eigen;
|
||||
inherit automoc4 phonon qimageblitz qca2 eigen soprano;
|
||||
poppler = pkgs.popplerQt4;
|
||||
};
|
||||
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
|
||||
, shared_mime_info, poppler, gsl, gmm, wv2, libwpd
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}:
|
||||
, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "koffice-2.1.2";
|
||||
name = "koffice-2.2.0";
|
||||
src = fetchurl {
|
||||
url = mirror://kde/stable/koffice-2.1.2/koffice-2.1.2.tar.bz2;
|
||||
sha256 = "1nmp2kmksk6vjw9bk04lnl8ld43hf4s0ras6vali725innvkn8v4";
|
||||
url = mirror://kde/stable/koffice-2.2.0/koffice-2.2.0.tar.bz2;
|
||||
sha256 = "0qa73grmn4c2d7zs5p0sxg6dws8hpg8v2vgp6frhj55l0sk3kqba";
|
||||
};
|
||||
buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info
|
||||
poppler gsl gmm wv2 libwpd
|
||||
kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ];
|
||||
poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc
|
||||
kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ];
|
||||
meta = {
|
||||
description = "KDE integrated Office Suite";
|
||||
license = "GPL";
|
||||
|
|
Loading…
Reference in a new issue