From 8cb2e1860fdb1f7afb59430aa7bd4a6874a056e2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 Jul 2011 16:13:40 +0000 Subject: [PATCH] * Add libkipi and libkexiv2. svn path=/nixpkgs/branches/kde-4.7/; revision=27727 --- pkgs/desktops/kde-4.7/default.nix | 6 ++++++ pkgs/desktops/kde-4.7/gwenview.nix | 4 ++-- pkgs/desktops/kde-4.7/libkexiv2.nix | 12 ++++++++++++ pkgs/desktops/kde-4.7/libkipi.nix | 12 ++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/kde-4.7/libkexiv2.nix create mode 100644 pkgs/desktops/kde-4.7/libkipi.nix diff --git a/pkgs/desktops/kde-4.7/default.nix b/pkgs/desktops/kde-4.7/default.nix index 3f8e3ac50eb..58216ecfd13 100644 --- a/pkgs/desktops/kde-4.7/default.nix +++ b/pkgs/desktops/kde-4.7/default.nix @@ -35,6 +35,12 @@ recurseIntoAttrs rec { soprano = callPackage ./support/soprano { }; + libkexiv2 = callPackage ./libkexiv2.nix { }; + + libkipi = callPackage ./libkipi.nix { }; + + kipi_plugins = callPackage ./kipi-plugins { }; + ### LIBS kdelibs = callPackage ./libs { }; diff --git a/pkgs/desktops/kde-4.7/gwenview.nix b/pkgs/desktops/kde-4.7/gwenview.nix index a1cab46f798..f349b2f7920 100644 --- a/pkgs/desktops/kde-4.7/gwenview.nix +++ b/pkgs/desktops/kde-4.7/gwenview.nix @@ -1,11 +1,11 @@ { kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano -, shared_desktop_ontologies, kde_baseapps }: +, shared_desktop_ontologies, kde_baseapps, libkipi }: kde.package { buildInputs = [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies - kde_baseapps + kde_baseapps libkipi ]; meta = { diff --git a/pkgs/desktops/kde-4.7/libkexiv2.nix b/pkgs/desktops/kde-4.7/libkexiv2.nix new file mode 100644 index 00000000000..6719caef899 --- /dev/null +++ b/pkgs/desktops/kde-4.7/libkexiv2.nix @@ -0,0 +1,12 @@ +{ automoc4, cmake, kde, kdelibs, qt4, exiv2 }: + +kde.package { + + buildInputs = [ cmake kdelibs qt4 automoc4 exiv2 ]; + + meta = { + description = "Exiv2 support library"; + license = "GPLv2"; + kde.name = "libkexiv2"; + }; +} diff --git a/pkgs/desktops/kde-4.7/libkipi.nix b/pkgs/desktops/kde-4.7/libkipi.nix new file mode 100644 index 00000000000..cb1e556af98 --- /dev/null +++ b/pkgs/desktops/kde-4.7/libkipi.nix @@ -0,0 +1,12 @@ +{ automoc4, cmake, kde, kdelibs, qt4 }: + +kde.package { + + buildInputs = [ cmake kdelibs qt4 automoc4 ]; + + meta = { + description = "Interface library to kipi-plugins"; + license = "GPLv2"; + kde.name = "libkipi"; + }; +}