From 84ff78dd8b98126798a33e10d078b8cfee101c00 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 May 2015 10:53:26 -0500
Subject: [PATCH] kdeApps_15_04: fix kaccounts-integration

---
 pkgs/applications/kde-apps-15.04/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index e29f484237f..c3bbbb35c05 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -12,7 +12,7 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, debug ? false }:
+{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, callPackage, debug ? false }:
 
 with stdenv.lib; with autonix;
 
@@ -191,6 +191,14 @@ let
         nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
       };
 
+      kaccounts-integration =
+        let accounts-qt = pkgs.accounts-qt.override { inherit qt5; };
+            signon = pkgs.signon.override { inherit qt5; };
+        in super.kaccounts-integration // {
+          buildInputs = super.kaccounts-integration.buildInputs
+            ++ [ accounts-qt signon ];
+        };
+
       kaccounts-providers = super.kaccounts-providers // {
         buildInputs = super.kaccounts-providers.buildInputs
           ++ (with pkgs; [ intltool libaccounts-glib ]);
@@ -329,6 +337,13 @@ let
         buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
       };
 
+      marble = super.marble // {
+        preConfigure = ''
+          ${super.preConfigure or ""}
+          cmakeFlags="$cmakeFlags -DCMAKE_MODULES_INSTALL_PATH=$out/lib/cmake"
+        '';
+      };
+
     };
 
   l10nManifest =