Move koffice to applications/office
svn path=/nixpkgs/trunk/; revision=23900
This commit is contained in:
parent
3b693da649
commit
58c09d0ff2
42
pkgs/applications/office/koffice/default.nix
Normal file
42
pkgs/applications/office/koffice/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
|
||||
, shared_mime_info, popplerQt4, gsl, gmm, wv2, libwpd, libwpg, giflib, libgsf
|
||||
, fftw, pkgconfig, openjpeg , kdelibs, kdepimlibs, automoc4, phonon
|
||||
, qimageblitz, qca2, eigen, soprano , kdegraphics}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "koffice-2.2.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${name}/${name}.tar.bz2";
|
||||
sha256 = "1jzdq7av4vbfkx987yz54431q3bwrsd7wzyinl9wsznx83v61c75";
|
||||
};
|
||||
|
||||
patchFlags = "-p0";
|
||||
patches =
|
||||
let
|
||||
urlBase = "http://kexi-project.org/download/patches/2.2.2/";
|
||||
in
|
||||
[
|
||||
(fetchurl {
|
||||
url = "${urlBase}support-large-memo-values-for-msaccess-2.2.2.patch";
|
||||
sha256 = "1jn6na8c0vdf87p0yv9bcff0kd1jmcxndxmm3s0878l5pak9m8rd";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "${urlBase}fix-crash-on-closing-sqlite-connection-2.2.2.patch";
|
||||
sha256 = "11h4rxdrv5vakym5786vr4bysi4627m53qqvk1vhxf3rkawvcafj";
|
||||
})
|
||||
./wpd.patch
|
||||
];
|
||||
|
||||
buildInputs = [ cmake qt4 perl lcms exiv2 libxml2 libxslt boost glew
|
||||
shared_mime_info popplerQt4 gsl gmm wv2 libwpd libwpg giflib libgsf
|
||||
stdenv.gcc.libc fftw pkgconfig kdelibs kdepimlibs automoc4 phonon
|
||||
qimageblitz qca2 eigen openjpeg soprano kdegraphics ];
|
||||
|
||||
meta = {
|
||||
description = "KDE integrated Office Suite";
|
||||
license = "GPL";
|
||||
homepage = http://www.koffice.org;
|
||||
maintainers = with stdenv.lib.maintainers; [ sander urkud ];
|
||||
inherit (kdelibs.meta) platforms;
|
||||
};
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
diff --git a/cmake/modules/FindWPD.cmake b/cmake/modules/FindWPD.cmake
|
||||
diff cmake/modules/FindWPD.cmake cmake/modules/FindWPD.cmake
|
||||
index 9bd788c..927785a 100644
|
||||
--- a/cmake/modules/FindWPD.cmake
|
||||
+++ b/cmake/modules/FindWPD.cmake
|
||||
--- cmake/modules/FindWPD.cmake
|
||||
+++ cmake/modules/FindWPD.cmake
|
||||
@@ -19,14 +19,17 @@ if (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
|
||||
else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
|
||||
if(NOT WIN32)
|
@ -283,15 +283,7 @@ pkgs.recurseIntoAttrs (rec {
|
||||
inherit automoc4 phonon;
|
||||
};
|
||||
|
||||
koffice = import ./extragear/koffice {
|
||||
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 fftw;
|
||||
inherit kdelibs kdepimlibs;
|
||||
inherit automoc4 phonon qimageblitz qca2 eigen soprano;
|
||||
poppler = pkgs.popplerQt4;
|
||||
};
|
||||
|
||||
inherit (pkgs) konversation yakuake ktorrent;
|
||||
inherit (pkgs) konversation yakuake ktorrent koffice;
|
||||
|
||||
gtk_qt_engine = import ./extragear/gtk-qt-engine {
|
||||
inherit (pkgs) stdenv fetchurl cmake qt4 perl gettext;
|
||||
|
@ -1,21 +0,0 @@
|
||||
{ stdenv, fetchurl, lib, cmake, qt4, perl, lcms, exiv2, libxml2, libxslt, boost, glew
|
||||
, shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf, fftw
|
||||
, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "koffice-2.2.0";
|
||||
src = fetchurl {
|
||||
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 giflib libgsf stdenv.gcc.libc fftw
|
||||
kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ];
|
||||
patches = [ ./wpd.patch ];
|
||||
meta = {
|
||||
description = "KDE integrated Office Suite";
|
||||
license = "GPL";
|
||||
homepage = http://www.koffice.org;
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
};
|
||||
}
|
@ -5767,6 +5767,8 @@ let
|
||||
inherit (xlibs) libXv libX11;
|
||||
};
|
||||
|
||||
koffice = newScope pkgs.kde4 ../applications/office/koffice { };
|
||||
|
||||
konversation = newScope pkgs.kde4 ../applications/networking/irc/konversation { };
|
||||
|
||||
krename = newScope pkgs.kde4 ../applications/misc/krename { };
|
||||
|
Loading…
x
Reference in New Issue
Block a user