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

Upgraded koffice to 2.2.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=22153
This commit is contained in:
Sander van der Burg 2010-06-04 21:27:38 +00:00
parent 37427ca5db
commit 1e3e2f42a2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/kde-4.4/default.nix
View File

@ -282,10 +282,10 @@ pkgs.recurseIntoAttrs (rec {
}; };
koffice = import ./extragear/koffice { koffice = import ./extragear/koffice {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew; inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib libxml2 libxslt boost glew;
inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd; inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf;
inherit kdelibs kdepimlibs; inherit kdelibs kdepimlibs;
inherit automoc4 phonon qimageblitz qca2 eigen; inherit automoc4 phonon qimageblitz qca2 eigen soprano;
poppler = pkgs.popplerQt4; poppler = pkgs.popplerQt4;
}; };

14
pkgs/desktops/kde-4.4/extragear/koffice/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew { stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
, shared_mime_info, poppler, gsl, gmm, wv2, libwpd , shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf
, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen}: , kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "koffice-2.1.2"; name = "koffice-2.2.0";
src = fetchurl { src = fetchurl {
url = mirror://kde/stable/koffice-2.1.2/koffice-2.1.2.tar.bz2; url = mirror://kde/stable/koffice-2.2.0/koffice-2.2.0.tar.bz2;
sha256 = "1nmp2kmksk6vjw9bk04lnl8ld43hf4s0ras6vali725innvkn8v4"; sha256 = "0qa73grmn4c2d7zs5p0sxg6dws8hpg8v2vgp6frhj55l0sk3kqba";
}; };
buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew shared_mime_info
poppler gsl gmm wv2 libwpd poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc
kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen ]; kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ];
meta = { meta = {
description = "KDE integrated Office Suite"; description = "KDE integrated Office Suite";
license = "GPL"; license = "GPL";