Author: urkud
Date: Fri Aug 19 09:27:44 2011
New Revision: 28674
URL: https://svn.nixos.org/websvn/nix/?rev=28674&sc=1
Log:
Upgrade kipi-plugins to 1.9.0
Deleted:
nixpkgs/trunk/pkgs/applications/graphics/kipi-plugins/find-gdk.patch
Modified:
nixpkgs/trunk/pkgs/applications/graphics/kipi-plugins/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/kipi-plugins/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/kipi-plugins/default.nix Fri Aug
19 02:42:34 2011 (r28673)
+++ nixpkgs/trunk/pkgs/applications/graphics/kipi-plugins/default.nix Fri Aug
19 09:27:44 2011 (r28674)
@@ -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";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 19 02:42:34
2011 (r28673)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Aug 19 09:27:44
2011 (r28674)
@@ -6771,7 +6771,9 @@
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 {
inherit (pkgs.gtkLibs) pango;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
