diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-10-14 09:52:10 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-10-14 09:52:10 +0000 |
| commit | 1bda7748da5c737d33434fcbad9dd1160db70a89 (patch) | |
| tree | 0ad6bb02a314840af3739bc2080f92cceca5581f /pkgs/applications/graphics | |
| parent | b421bbd0eaff6e50b438255e6cbf3a42dd4c7197 (diff) | |
| download | nixpkgs-1bda7748da5c737d33434fcbad9dd1160db70a89.tar nixpkgs-1bda7748da5c737d33434fcbad9dd1160db70a89.tar.gz nixpkgs-1bda7748da5c737d33434fcbad9dd1160db70a89.tar.bz2 nixpkgs-1bda7748da5c737d33434fcbad9dd1160db70a89.tar.lz nixpkgs-1bda7748da5c737d33434fcbad9dd1160db70a89.tar.xz nixpkgs-1bda7748da5c737d33434fcbad9dd1160db70a89.tar.zst nixpkgs-1bda7748da5c737d33434fcbad9dd1160db70a89.zip | |
Fix digikam buld
svn path=/nixpkgs/trunk/; revision=24270
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/digikam/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/graphics/digikam/include.diff | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 8d52a9dfbb1..6d4431516f8 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 00000000000..0762ce04d26 --- /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} + ) + |