diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-06-04 21:27:38 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2010-06-04 21:27:38 +0000 |
| commit | 1e3e2f42a219c9215b652c18dc2049e2b31d1e45 (patch) | |
| tree | 8e869eed7f21441101d94172d0c8baa1a753ca17 /pkgs | |
| parent | 37427ca5db2c80da1df7db29668ab34fe2482a31 (diff) | |
| download | nixlib-1e3e2f42a219c9215b652c18dc2049e2b31d1e45.tar nixlib-1e3e2f42a219c9215b652c18dc2049e2b31d1e45.tar.gz nixlib-1e3e2f42a219c9215b652c18dc2049e2b31d1e45.tar.bz2 nixlib-1e3e2f42a219c9215b652c18dc2049e2b31d1e45.tar.lz nixlib-1e3e2f42a219c9215b652c18dc2049e2b31d1e45.tar.xz nixlib-1e3e2f42a219c9215b652c18dc2049e2b31d1e45.tar.zst nixlib-1e3e2f42a219c9215b652c18dc2049e2b31d1e45.zip | |
Upgraded koffice to 2.2.0
svn path=/nixpkgs/trunk/; revision=22153
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.4/extragear/koffice/default.nix | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index 36c30bc9124f..24ebfbe58c80 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -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; }; diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix index c3281f354be2..069afd27281e 100644 --- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix @@ -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"; |