Merging from trunk.

I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251

1 files changed, 0 insertions, 21 deletions

diff --git a/pkgs/desktops/kde-4.3/extragear/koffice/default.nix b/pkgs/desktops/kde-4.3/extragear/koffice/default.nix
deleted file mode 100644
index ded87af7240..00000000000
--- a/pkgs/desktops/kde-4.3/extragear/koffice/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ 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}:
-
-stdenv.mkDerivation {
-  name = "koffice-2.1.0";
-  src = fetchurl {
-    url = mirror://kde/stable/koffice-2.1.0/koffice-2.1.0.tar.bz2;
-    sha256 = "1jdc2rvj5xqd66d152zmjz2psq44kbraqpl0fq05yjg2wz8kdsln";
-  }; 
-  includeAllQtDirs=true;
-  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 ];
-  meta = {
-    description = "KDE integrated Office Suite";
-    license = "GPL";
-    homepage = http://www.koffice.org;
-    maintainers = [ lib.maintainers.sander ];
-  };
-}