nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-31 22:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade kipi-plugins to 1.9.0

Browse Source 
svn path=/nixpkgs/trunk/; revision=28674
This commit is contained in:
Yury G. Kudryashov 2011-08-19 09:27:44 +00:00
parent e6e11e4b04
commit d67ed200d2
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,20 +1,21 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, { stdenv, fetchurl, kdelibs, qimageblitz, qca2, libkexiv2, libkdcraw, libkipi
kdegraphics, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gtk }: , libksane, kdepimlibs, libxml2, libxslt, gettext, opencv, libgpod, gdk_pixbuf
, qjson , pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kipi-plugins-1.5.0"; name = "kipi-plugins-1.9.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/kipi/${name}.tar.bz2"; url = "mirror://sourceforge/kipi/${name}.tar.bz2";
sha256 = "1wsqh0lbsqyzdfmb9f53bmmypw00n80p62ym4pnxb8w0zwlhbkbw"; sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
}; };
buildInputs = [ cmake qt4 kdelibs kdegraphics automoc4 phonon qimageblitz qca2 kdepimlibs buildInputs =
libxml2 libxslt gettext opencv libgpod gtk ]; [ kdelibs libkexiv2 libkdcraw libkipi qimageblitz qca2 kdepimlibs libxml2
libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
];
KDEDIRS = kdegraphics; buildNativeInputs = [ pkgconfig ];
patches = [ ./find-gdk.patch ];
meta = { meta = {
description = "Photo Management Program"; description = "Photo Management Program";

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

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -6771,7 +6771,9 @@ let
inherit (gnome) libglade; inherit (gnome) libglade;
}; };
kipi_plugins = newScope pkgs.kde4 ../applications/graphics/kipi-plugins { }; kipi_plugins = newScope pkgs.kde47 ../applications/graphics/kipi-plugins {
inherit (pkgs.gtkLibs) gdk_pixbuf;
};
kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer { kmplayer = newScope pkgs.kde4 ../applications/video/kmplayer {
inherit (pkgs.gtkLibs) pango; inherit (pkgs.gtkLibs) pango;