diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:21:31 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-07 21:21:31 +0000 |
| commit | fca582bff0ab8887835ca10495620d0ac15ab10a (patch) | |
| tree | 0934656b725b9a5da0acb8025f3a9ceab2e63d90 /pkgs/applications/graphics/kipi-plugins | |
| parent | 2291f661b03f29fd59549165721a1426e5d04264 (diff) | |
| parent | 89a3dc9adac5aa195ec9334c2f7e255e02388157 (diff) | |
| download | nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.gz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.bz2 nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.lz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.xz nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.tar.zst nixlib-fca582bff0ab8887835ca10495620d0ac15ab10a.zip | |
Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
Diffstat (limited to 'pkgs/applications/graphics/kipi-plugins')
| -rw-r--r-- | pkgs/applications/graphics/kipi-plugins/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/applications/graphics/kipi-plugins/find-gdk.patch | 16 |
2 files changed, 42 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix new file mode 100644 index 000000000000..22174333a4d0 --- /dev/null +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, +kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }: + +stdenv.mkDerivation rec { + name = "kipi-plugins-1.4.0"; + + src = fetchurl { + url = "mirror://sourceforge/kipi/${name}.tar.bz2"; + sha256 = "1ybxhp4rs6c5xlrs0q765vrx4mvw4k0kq6n42dyk3kxvmcb9iq34"; + }; + + buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs + libxml2 libxslt gettext opencv libgpod gtk ]; + + KDEDIRS = kdegraphics; + + patches = [ ./find-gdk.patch ]; + + meta = { + description = "Photo Management Program"; + license = "GPL"; + homepage = http://www.kipi-plugins.org; + inherit (kdelibs.meta) platforms; + maintainers = with stdenv.lib.maintainers; [ viric urkud ]; + }; +} diff --git a/pkgs/applications/graphics/kipi-plugins/find-gdk.patch b/pkgs/applications/graphics/kipi-plugins/find-gdk.patch new file mode 100644 index 000000000000..22dcf0323fcb --- /dev/null +++ b/pkgs/applications/graphics/kipi-plugins/find-gdk.patch @@ -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 |