diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-19 09:27:44 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-19 09:27:44 +0000 |
commit | d67ed200d2830b63aa2001d7dc0663ac8706eb91 (patch) | |
tree | ea0b1a97052b45ea25e603f059cc8fe6691aafba /pkgs/applications/graphics | |
parent | e6e11e4b04f281f25dfcc4e0b87fd4e24129eac7 (diff) |
Upgrade kipi-plugins to 1.9.0
svn path=/nixpkgs/trunk/; revision=28674
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/kipi-plugins/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/graphics/kipi-plugins/find-gdk.patch | 16 |
2 files changed, 10 insertions, 25 deletions
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix index c3fe93a77ea89..96ab03a2784d1 100644 --- a/pkgs/applications/graphics/kipi-plugins/default.nix +++ b/pkgs/applications/graphics/kipi-plugins/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, -kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }: +{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, libkexiv2, libkdcraw, libkipi +, libksane, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gdk_pixbuf +, qjson , pkgconfig }: stdenv.mkDerivation rec { - name = "kipi-plugins-1.5.0"; + name = "kipi-plugins-1.9.0"; src = fetchurl { url = "mirror://sourceforge/kipi/${name}.tar.bz2"; - sha256 = "1wsqh0lbsqyzdfmb9f53bmmypw00n80p62ym4pnxb8w0zwlhbkbw"; + sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m"; }; - buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs - libxml2 libxslt gettext opencv libgpod gtk ]; + buildInputs = + [ kdelibs libkexiv2 libkdcraw libkipi qimageblitz qca2 kdepimlibs libxml2 + libksane libxslt gettext opencv libgpod gdk_pixbuf qjson + ]; - KDEDIRS = kdegraphics; - - patches = [ ./find-gdk.patch ]; + buildNativeInputs = [ pkgconfig ]; meta = { description = "Photo Management Program"; diff --git a/pkgs/applications/graphics/kipi-plugins/find-gdk.patch b/pkgs/applications/graphics/kipi-plugins/find-gdk.patch deleted file mode 100644 index 22dcf0323fcb0..0000000000000 --- a/pkgs/applications/graphics/kipi-plugins/find-gdk.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 |