From e2204b72b8523a4814f5a7610fd7a76ba05081e7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 18 Oct 2016 06:45:19 -0500 Subject: [PATCH 1/3] kde5.kipi-plugins: init at 5.2.0 --- .../graphics/kipi-plugins/5.x.nix | 34 +++++++++++++++++++ pkgs/desktops/kde-5/applications/default.nix | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/graphics/kipi-plugins/5.x.nix diff --git a/pkgs/applications/graphics/kipi-plugins/5.x.nix b/pkgs/applications/graphics/kipi-plugins/5.x.nix new file mode 100644 index 000000000000..2f6cc8e4ece0 --- /dev/null +++ b/pkgs/applications/graphics/kipi-plugins/5.x.nix @@ -0,0 +1,34 @@ +{ + stdenv, fetchurl, + ecm, + karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui, + libkipi, qtbase, qtsvg, qtxmlpatterns +}: + +stdenv.mkDerivation rec { + name = "kipi-plugins-${version}"; + version = "5.2.0"; + + src = fetchurl { + url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz"; + sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g"; + }; + + prePatch = '' + cd extra/kipi-plugins + ''; + + nativeBuildInputs = [ ecm ]; + buildInputs = [ + karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi + qtbase qtsvg qtxmlpatterns + ]; + + meta = { + description = "Plugins for KDE-based image applications"; + license = stdenv.lib.licenses.gpl2; + homepage = http://www.digikam.org; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index 45027c4c9978..942bd5eb9779 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -64,6 +64,9 @@ let spectacle = callPackage ./spectacle.nix {}; l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; }); + + # External packages + kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {}; }; in packages From e62ab65fe6d647fbf6923ec46464fb0f0da47a8f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 18 Oct 2016 06:45:30 -0500 Subject: [PATCH 2/3] kde5.gwenview: include kipi-plugins --- pkgs/desktops/kde-5/applications/gwenview.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/desktops/kde-5/applications/gwenview.nix index 8a39bad30ab8..18f5036127d0 100644 --- a/pkgs/desktops/kde-5/applications/gwenview.nix +++ b/pkgs/desktops/kde-5/applications/gwenview.nix @@ -1,8 +1,8 @@ { kdeApp, lib, kdeWrapper, ecm, kdoctools, - baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, libkdcraw, libkipi, - phonon, qtsvg, qtx11extras + baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2, + libkdcraw, libkipi, phonon, qtsvg, qtx11extras }: let @@ -20,4 +20,7 @@ let ]; }; in -kdeWrapper unwrapped { targets = [ "bin/gwenview" ]; } +kdeWrapper unwrapped { + targets = [ "bin/gwenview" ]; + paths = [ kipi-plugins ]; +} From 7f4ad13ef62d2fe826eaad33bdea24890f0b7442 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 18 Oct 2016 06:45:40 -0500 Subject: [PATCH 3/3] kde5.spectacle: include kipi-plugins --- pkgs/desktops/kde-5/applications/spectacle.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/desktops/kde-5/applications/spectacle.nix index 26faea2678a9..aa618ffcde11 100644 --- a/pkgs/desktops/kde-5/applications/spectacle.nix +++ b/pkgs/desktops/kde-5/applications/spectacle.nix @@ -1,8 +1,9 @@ { kdeApp, lib, kdeWrapper, ecm, kdoctools, - kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications, - kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor + kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins, + knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, + xcb-util-cursor }: let @@ -17,4 +18,7 @@ let ]; }; in -kdeWrapper unwrapped { targets = [ "bin/spectacle" ]; } +kdeWrapper unwrapped { + targets = [ "bin/spectacle" ]; + paths = [ kipi-plugins ]; +}