Author: urkud Date: 2010-06-28 20:56:16 +0000 (Mon, 28 Jun 2010) New Revision: 22426
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22426&view=rev Added: nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/default.nix Log: koffice: add fftw and fix FindWPD.cmake Changes: Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix =================================================================== --- nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-28 18:36:37 UTC (rev 22425) +++ nixpkgs/trunk/pkgs/desktops/kde-4.4/default.nix 2010-06-28 20:56:16 UTC (rev 22426) @@ -283,7 +283,7 @@ 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; Modified: nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/default.nix =================================================================== --- nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/default.nix 2010-06-28 18:36:37 UTC (rev 22425) +++ nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/default.nix 2010-06-28 20:56:16 UTC (rev 22426) @@ -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 @@ 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"; Added: nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch =================================================================== --- nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch (rev 0) +++ nixpkgs/trunk/pkgs/desktops/kde-4.4/extragear/koffice/wpd.patch 2010-06-28 20:56:16 UTC (rev 22426) @@ -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 ) _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits
