Clean up KDE Frameworks

4 files changed, 24 insertions, 28 deletions

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index cb73bbddda7e..ffb8fb04078b 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -78,16 +78,8 @@ let
     baloo = callPackage ./baloo.nix {};
     bluez-qt = callPackage ./bluez-qt.nix {};
     breeze-icons = callPackage ./breeze-icons.nix {};
-    # FIXME: this collides with the "ecm" package.
-    ecm =
-      let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }:
-            makeSetupHook
-            { deps = lib.chooseDevOutputs [ cmake ecmNoHooks pkgconfig qtbase qttools ]; }
-            ./setup-hook.sh;
-      in callPackage drv {};
-    ecmNoHooks = callPackage ./extra-cmake-modules {
-      inherit (srcs.extra-cmake-modules) src version;
-    };
+    ecm = callPackage ./extra-cmake-modules {};
+    ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix {};
     frameworkintegration = callPackage ./frameworkintegration.nix {};
     kactivities = callPackage ./kactivities.nix {};
     kactivities-stats = callPackage ./kactivities-stats.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index d2f1688e330b..6c0919a23619 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -1,20 +1,6 @@
-{ stdenv, lib, copyPathsToStore, src, version, cmake }:
+{ makeSetupHook, lib, cmake, ecmNoHooks, pkgconfig, qtbase, qttools }:
 
-stdenv.mkDerivation {
-  name = "extra-cmake-modules-${version}";
-
-  inherit src;
-
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
-  outputs = [ "out" ];  # this package has no runtime components
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
-    license = licenses.bsd2;
-    maintainers = [ maintainers.ttuegel ];
-  };
+makeSetupHook {
+  deps = lib.chooseDevOutputs [ cmake ecmNoHooks pkgconfig qtbase qttools ];
 }
+./setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix
new file mode 100644
index 000000000000..855d6bdb3d25
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, copyPathsToStore, cmake }:
+
+kdeFramework {
+  name = "extra-cmake-modules";
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  outputs = [ "out" ];  # this package has no runtime components
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index a1638ca541be..a1638ca541be 100644
--- a/pkgs/development/libraries/kde-frameworks/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh