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

koffice: add fftw and fix FindWPD.cmake 

svn path=/nixpkgs/trunk/; revision=22426
This commit is contained in:
Yury G. Kudryashov 2010-06-28 20:56:16 +00:00
parent 362d1ba38f
commit 66ff572c8b
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,7 +283,7 @@ pkgs.recurseIntoAttrs (rec {
koffice = import ./extragear/koffice { koffice = import ./extragear/koffice {
inherit (pkgs) stdenv fetchurl lib cmake qt4 perl lcms exiv2 giflib 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 libgsf; inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf fftw;
inherit kdelibs kdepimlibs; inherit kdelibs kdepimlibs;
inherit automoc4 phonon qimageblitz qca2 eigen soprano; inherit automoc4 phonon qimageblitz qca2 eigen soprano;
poppler = pkgs.popplerQt4; poppler = pkgs.popplerQt4;

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

@ -1,5 +1,5 @@
{ 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, giflib, libgsf , shared_mime_info, poppler, gsl, gmm, wv2, libwpd, giflib, libgsf, fftw
, kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}: , kdelibs, kdepimlibs, automoc4, phonon, qimageblitz, qca2, eigen, soprano}:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -9,8 +9,9 @@ stdenv.mkDerivation {
sha256 = "0qa73grmn4c2d7zs5p0sxg6dws8hpg8v2vgp6frhj55l0sk3kqba"; 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 giflib libgsf stdenv.gcc.libc poppler gsl gmm wv2 libwpd giflib libgsf stdenv.gcc.libc fftw
kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ]; kdelibs kdepimlibs automoc4 phonon qimageblitz qca2 eigen soprano ];
patches = [ ./wpd.patch ];
meta = { meta = {
description = "KDE integrated Office Suite"; description = "KDE integrated Office Suite";
license = "GPL"; license = "GPL";

24
pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/cmake/modules/FindWPD.cmake b/cmake/modules/FindWPD.cmake
index 9bd788c..927785a 100644
--- a/cmake/modules/FindWPD.cmake
+++ b/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)
INCLUDE(FindPkgConfig)
- pkg_check_modules(WPD libwpd-0.8)
+ pkg_check_modules(PKG_WPD libwpd-0.8)
endif(NOT WIN32)
FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
- ${WPD_INCLUDE_DIR}
+ ${PKG_WPD_INCLUDE_DIRS}
/usr/include/libwpd-0.8
)
+ FIND_LIBRARY(WPD_LIBRARIES wpd-0.8
+ ${PKG_WPD_LIBRARY_DIRS}
+ )
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(WPD DEFAULT_MSG WPD_INCLUDE_DIR WPD_LIBRARIES )