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

kipi-plugins: find gdk 

svn path=/nixpkgs/trunk/; revision=24091
This commit is contained in:
Yury G. Kudryashov 2010-10-05 17:44:17 +00:00
parent d7d8f7d64f
commit 4591f1fe51
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/kipi-plugins/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2,
kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod}: kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kipi-plugins-1.4.0"; name = "kipi-plugins-1.4.0";
@ -10,10 +10,12 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs
libxml2 libxslt gettext opencv libgpod ]; libxml2 libxslt gettext opencv libgpod gtk ];
KDEDIRS = kdegraphics; KDEDIRS = kdegraphics;
patches = [ ./find-gdk.patch ];
meta = { meta = {
description = "Photo Management Program"; description = "Photo Management Program";
license = "GPL"; license = "GPL";

16
pkgs/applications/graphics/kipi-plugins/find-gdk.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/cmake/modules/FindGdk.cmake b/cmake/modules/FindGdk.cmake
index 033959a..ff61961 100644
--- a/cmake/modules/FindGdk.cmake
+++ b/cmake/modules/FindGdk.cmake
@@ -23,8 +23,9 @@ else (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
set(GDK_DEFINITIONS ${_GDKCflags})
endif(NOT WIN32)
- FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0
- ${_GDKIncDir}
+ FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h
+ HINTS ${_GDKIncDir}
+ PATH_SUFFIXES gtk-2.0
)
FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0