From 1bda7748da5c737d33434fcbad9dd1160db70a89 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Thu, 14 Oct 2010 09:52:10 +0000 Subject: [PATCH] Fix digikam buld svn path=/nixpkgs/trunk/; revision=24270 --- pkgs/applications/graphics/digikam/default.nix | 2 ++ pkgs/applications/graphics/digikam/include.diff | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/graphics/digikam/include.diff diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 8d52a9dfbb1d..6d4431516f8e 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { KDEDIRS=kdeedu; + patches = [ ./include.diff ]; + meta = { description = "Photo Management Program"; license = "GPL"; diff --git a/pkgs/applications/graphics/digikam/include.diff b/pkgs/applications/graphics/digikam/include.diff new file mode 100644 index 000000000000..0762ce04d263 --- /dev/null +++ b/pkgs/applications/graphics/digikam/include.diff @@ -0,0 +1,12 @@ +diff --git a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt +index 9ee36cc..c6e5c00 100644 +--- a/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt ++++ b/libs/imageproperties/markerclusterholderplugin/CMakeLists.txt +@@ -18,6 +18,7 @@ IF(MARBLEWIDGET_SUPPORTS_PLUGINS) + + INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/libs/imageproperties/markerclusterholderplugin/ + ${CMAKE_BINARY_DIR}/libs/imageproperties/markerclusterholderplugin/ ++ ${LIBMARBLEWIDGET_INCLUDE_DIR}/.. + ${QT_INCLUDE_DIR} + ) +