diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-06-28 20:56:16 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-06-28 20:56:16 +0000 |
| commit | 66ff572c8b159c8b816b9ad138c268096f5f1de3 (patch) | |
| tree | 41eeae80c1f74df8f56af09c4c234cd4ac2fc836 /pkgs/desktops/kde-4.4 | |
| parent | 362d1ba38fed167007b282f3a0f135d165f0d373 (diff) | |
| download | nixlib-66ff572c8b159c8b816b9ad138c268096f5f1de3.tar nixlib-66ff572c8b159c8b816b9ad138c268096f5f1de3.tar.gz nixlib-66ff572c8b159c8b816b9ad138c268096f5f1de3.tar.bz2 nixlib-66ff572c8b159c8b816b9ad138c268096f5f1de3.tar.lz nixlib-66ff572c8b159c8b816b9ad138c268096f5f1de3.tar.xz nixlib-66ff572c8b159c8b816b9ad138c268096f5f1de3.tar.zst nixlib-66ff572c8b159c8b816b9ad138c268096f5f1de3.zip | |
koffice: add fftw and fix FindWPD.cmake
svn path=/nixpkgs/trunk/; revision=22426
Diffstat (limited to 'pkgs/desktops/kde-4.4')
| -rw-r--r-- | pkgs/desktops/kde-4.4/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.4/extragear/koffice/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch | 24 |
3 files changed, 28 insertions, 3 deletions
diff --git a/pkgs/desktops/kde-4.4/default.nix b/pkgs/desktops/kde-4.4/default.nix index fe3519642be3..495682cc23f3 100644 --- a/pkgs/desktops/kde-4.4/default.nix +++ b/pkgs/desktops/kde-4.4/default.nix @@ -283,7 +283,7 @@ pkgs.recurseIntoAttrs (rec { 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; + inherit (pkgs) shared_mime_info gsl gmm wv2 libwpd libgsf fftw; inherit kdelibs kdepimlibs; 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 069afd27281e..2bc5ea5fab8b 100644 --- a/pkgs/desktops/kde-4.4/extragear/koffice/default.nix +++ b/pkgs/desktops/kde-4.4/extragear/koffice/default.nix @@ -1,5 +1,5 @@ { 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}: stdenv.mkDerivation { @@ -9,8 +9,9 @@ stdenv.mkDerivation { 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 + 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"; diff --git a/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch b/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch new file mode 100644 index 000000000000..2b0af918bae3 --- /dev/null +++ b/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch @@ -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 ) |