From 40b838b94d906793d160fa17f817157fc684cdbe Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jul 2016 21:13:00 -0500
Subject: kde5: fix all the Qt version dependencies

---
 pkgs/development/libraries/kde-frameworks/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 94e8f5db3b77e..c6f8b120b8dba 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -22,10 +22,6 @@ let
 
     kdeDerivation = args:
       let
-        setupHook =
-          let drv = { qtbase, qttools }:
-                makeSetupHook { deps = [ qtbase qttools ]; } ./setup-hook.sh;
-          in callPackage drv {};
       in stdenv.mkDerivation (args // {
 
         outputs = args.outputs or [ "dev" "out" ];
@@ -37,7 +33,7 @@ let
 
         nativeBuildInputs =
           (args.nativeBuildInputs or [])
-          ++ [ pkgs.cmake pkgs.pkgconfig setupHook ];
+          ++ [ pkgs.cmake pkgs.pkgconfig ecm ];
 
       });
 
@@ -62,6 +58,12 @@ let
     baloo = callPackage ./baloo.nix {};
     bluez-qt = callPackage ./bluez-qt.nix {};
     breeze-icons = callPackage ./breeze-icons.nix {};
+    ecm =
+      let drv = { qtbase, qttools }:
+            makeSetupHook
+            { deps = [ extra-cmake-modules qtbase qttools ]; }
+            ./setup-hook.sh;
+      in callPackage drv {};
     extra-cmake-modules = callPackage ./extra-cmake-modules {
       inherit (srcs.extra-cmake-modules) src version;
     };
-- 
cgit 1.4.1