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";