kf513: don't override mkDerivation

Provides a globally unique name (kdeFramework) instead of using attribute paths as namespaces and locally overloading the mkDerivation name.
2024-09-29 08:30:21 +02:00 · 2015-09-29 16:57:26 -05:00 · 2015-09-29 16:57:26 -05:00 · 5ba93bd4c3
parent cf5ed04f49
commit 5ba93bd4c3
69 changed files with 140 additions and 141 deletions
--- a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/attica.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "attica";
  nativeBuildInputs = [ extra-cmake-modules ];
  meta = {
--- a/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kauth
 , kconfig
@ -15,7 +15,7 @@
 , solid
 }:

-mkDerivation {
+kdeFramework {
  name = "baloo";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , qtdeclarative
 }:

-mkDerivation {
+kdeFramework {
  name = "bluez-qt";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ qtdeclarative ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/default.nix
@ -9,17 +9,16 @@

 let

-  inherit (pkgs) lib;
+  inherit (pkgs) lib stdenv;

  mirror = "mirror://kde";
  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };

-  mkDerivation = args:
+  kdeFramework = args:
    let
      inherit (args) name;
      inherit (srcs."${name}") src version;
-      inherit (pkgs.stdenv) mkDerivation;
-    in mkDerivation (args // {
+    in stdenv.mkDerivation (args // {
      name = "${name}-${version}";
      inherit src;

@ -108,6 +107,6 @@ let
    threadweaver = callPackage ./threadweaver.nix {};
  };

-  newScope = scope: pkgs.qt55Libs.newScope ({ inherit mkDerivation; } // scope);
+  newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope);

 in lib.makeScope newScope addPackages
--- a/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/extra-cmake-modules/default.nix
@ -1,6 +1,6 @@
-{ mkDerivation, lib, stdenv, cmake, pkgconfig, qttools }:
+{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:

-mkDerivation {
+kdeFramework {
  name = "extra-cmake-modules";
  setupHook = ./setup-hook.sh;
  patches = [ ./0001-extra-cmake-modules-paths.patch ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kbookmarks
 , kcompletion
@ -13,7 +13,7 @@
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "frameworkintegration";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , boost
 , kcmutils
@ -15,7 +15,7 @@
 , qtdeclarative
 }:

-mkDerivation {
+kdeFramework {
  name = "kactivities";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , python
 }:

-mkDerivation {
+kdeFramework {
  name = "kapidox";
  nativeBuildInputs = [ extra-cmake-modules python ];
  meta = {
--- a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "karchive";
  nativeBuildInputs = [ extra-cmake-modules ];
  meta = {
--- a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix
@ -1,10 +1,10 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcoreaddons
 , polkitQt
 }:

-mkDerivation {
+kdeFramework {
  name = "kauth";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ polkitQt ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcodecs
 , kconfig
@ -8,7 +8,7 @@
 , kxmlgui
 }:

-mkDerivation {
+kdeFramework {
  name = "kbookmarks";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfigwidgets
 , kcoreaddons
@ -11,7 +11,7 @@
 , kxmlgui
 }:

-mkDerivation {
+kdeFramework {
  name = "kcmutils";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "kcodecs";
  nativeBuildInputs = [ extra-cmake-modules ];
  meta = {
--- a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix
@ -1,10 +1,10 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kwidgetsaddons
 }:

-mkDerivation {
+kdeFramework {
  name = "kcompletion";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kconfig kwidgetsaddons ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "kconfig";
  nativeBuildInputs = [ extra-cmake-modules ];
  postInstall = ''
--- a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kauth
 , kcodecs
@ -9,7 +9,7 @@
 , kwidgetsaddons
 }:

-mkDerivation {
+kdeFramework {
  name = "kconfigwidgets";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [ kguiaddons ki18n ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , shared_mime_info
 }:

-mkDerivation {
+kdeFramework {
  name = "kcoreaddons";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ shared_mime_info ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix
@ -1,11 +1,11 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcoreaddons
 , kwindowsystem
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "kcrash";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "kdbusaddons";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ qtx11extras ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , epoxy
 , kconfig
@ -14,7 +14,7 @@
 , qtdeclarative
 }:

-mkDerivation {
+kdeFramework {
  name = "kdeclarative";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kded.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kcoreaddons
@ -9,7 +9,7 @@
 , kservice
 }:

-mkDerivation {
+kdeFramework {
  name = "kded";
  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , docbook_xml_dtd_45
 , kauth
@ -35,7 +35,7 @@

 # TODO: debug docbook detection

-mkDerivation {
+kdeFramework {
  name = "kdelibs4support";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcompletion
 , kconfig
@ -16,7 +16,7 @@
 , sonnet
 }:

-mkDerivation {
+kdeFramework {
  name = "kdesignerplugin";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcoreaddons
 , ki18n
@ -6,7 +6,7 @@
 , kservice
 }:

-mkDerivation {
+kdeFramework {
  name = "kdesu";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kcoreaddons ki18n kservice ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kcoreaddons
@ -11,7 +11,7 @@
 , qtwebkit
 }:

-mkDerivation {
+kdeFramework {
  name = "kdewebkit";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , avahi
 }:

-mkDerivation {
+kdeFramework {
  name = "kdnssd";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ avahi ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , docbook_xml_dtd_45
 , docbook5_xsl
@ -8,7 +8,7 @@
 , perlPackages
 }:

-mkDerivation {
+kdeFramework {
  name = "kdoctools";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ karchive ki18n ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , karchive
 , kconfig
@ -6,7 +6,7 @@
 , kservice
 }:

-mkDerivation {
+kdeFramework {
  name = "kemoticons";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ karchive kconfig kcoreaddons ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , attr
 , ebook_tools
@ -11,7 +11,7 @@
 , taglib
 }:

-mkDerivation {
+kdeFramework {
  name = "kfilemetadata";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kcoreaddons
@ -8,7 +8,7 @@
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "kglobalaccel";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "kguiaddons";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ qtx11extras ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , giflib
 , karchive
@ -21,7 +21,7 @@
 , sonnet
 }:

-mkDerivation {
+kdeFramework {
  name = "khtml";
  nativeBuildInputs = [ extra-cmake-modules perl ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix
@ -1,11 +1,11 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , gettext
 , python
 , qtscript
 }:

-mkDerivation {
+kdeFramework {
  name = "ki18n";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ qtscript ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfigwidgets
 , ki18n
@ -6,7 +6,7 @@
 , qtsvg
 }:

-mkDerivation {
+kdeFramework {
  name = "kiconthemes";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix
@ -1,10 +1,10 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , qtbase
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "kidletime";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ qtx11extras ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , ilmbase
 }:

-mkDerivation {
+kdeFramework {
  name = "kimageformats";
  nativeBuildInputs = [ extra-cmake-modules ];
  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
--- a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kcrash
@ -13,7 +13,7 @@

 # TODO: setuid wrapper

-mkDerivation {
+kdeFramework {
  name = "kinit";
  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
  buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kio.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kio.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , acl
 , karchive
@ -25,7 +25,7 @@
 , solid
 }:

-mkDerivation {
+kdeFramework {
  name = "kio";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "kitemmodels";
  nativeBuildInputs = [ extra-cmake-modules ];
  meta = {
--- a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "kitemviews";
  nativeBuildInputs = [ extra-cmake-modules ];
  meta = {
--- a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix
@ -1,11 +1,11 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcoreaddons
 , kwidgetsaddons
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "kjobwidgets";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kdoctools
 }:

-mkDerivation {
+kdeFramework {
  name = "kjs";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  postInstall = ''
--- a/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kdoctools
 , ki18n
@ -6,7 +6,7 @@
 , qtsvg
 }:

-mkDerivation {
+kdeFramework {
  name = "kjsembed";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [ qtsvg ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix
@ -1,10 +1,10 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kparts
 , kxmlgui
 }:

-mkDerivation {
+kdeFramework {
  name = "kmediaplayer";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kxmlgui ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , attica
 , karchive
@ -15,7 +15,7 @@
 , kxmlgui
 }:

-mkDerivation {
+kdeFramework {
  name = "knewstuff";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcodecs
 , kconfig
@ -8,7 +8,7 @@
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "knotifications";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcompletion
 , kconfig
@ -7,7 +7,7 @@
 , phonon
 }:

-mkDerivation {
+kdeFramework {
  name = "knotifyconfig";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ kcompletion kconfig ki18n kio phonon ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , karchive
 , kconfig
@ -7,7 +7,7 @@
 , ki18n
 }:

-mkDerivation {
+kdeFramework {
  name = "kpackage";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [ karchive kconfig ki18n ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kcoreaddons
@ -13,7 +13,7 @@
 , kxmlgui
 }:

-mkDerivation {
+kdeFramework {
  name = "kparts";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcoreaddons
 , ki18n
@ -8,7 +8,7 @@
 , qtdeclarative
 }:

-mkDerivation {
+kdeFramework {
  name = "kpeople";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "kplotting";
  nativeBuildInputs = [ extra-cmake-modules ];
  meta = {
--- a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix
@ -1,10 +1,10 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcoreaddons
 , ki18n
 }:

-mkDerivation {
+kdeFramework {
  name = "kpty";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ ki18n ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kross.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcompletion
 , kcoreaddons
@ -12,7 +12,7 @@
 , qtscript
 }:

-mkDerivation {
+kdeFramework {
  name = "kross";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kcoreaddons
@ -11,7 +11,7 @@
 , threadweaver
 }:

-mkDerivation {
+kdeFramework {
  name = "krunner";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kcoreaddons
@ -9,7 +9,7 @@
 , kwindowsystem
 }:

-mkDerivation {
+kdeFramework {
  name = "kservice";
  setupHook = ./setup-hook.sh;
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , karchive
 , kconfig
@ -13,7 +13,7 @@
 , sonnet
 }:

-mkDerivation {
+kdeFramework {
  name = "ktexteditor";
  nativeBuildInputs = [ extra-cmake-modules perl ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kcompletion
 , kconfig
@ -10,7 +10,7 @@
 , sonnet
 }:

-mkDerivation {
+kdeFramework {
  name = "ktextwidgets";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , ki18n
 }:

-mkDerivation {
+kdeFramework {
  name = "kunitconversion";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ ki18n ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kconfig
 , kcoreaddons
@ -13,7 +13,7 @@
 , libgcrypt
 }:

-mkDerivation {
+kdeFramework {
  name = "kwallet";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "kwidgetsaddons";
  nativeBuildInputs = [ extra-cmake-modules ];
  meta = {
--- a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "kwindowsystem";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ qtx11extras ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , attica
 , kconfig
@ -12,7 +12,7 @@
 , sonnet
 }:

-mkDerivation {
+kdeFramework {
  name = "kxmlgui";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix
@ -1,10 +1,10 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , ki18n
 , kio
 }:

-mkDerivation {
+kdeFramework {
  name = "kxmlrpcclient";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ ki18n ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , modemmanager
 }:

-mkDerivation {
+kdeFramework {
  name = "modemmanager-qt";
  nativeBuildInputs = [ extra-cmake-modules ];
  propagatedBuildInputs = [ modemmanager ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , networkmanager
 }:

-mkDerivation {
+kdeFramework {
  name = "networkmanager-qt";
  nativeBuildInputs = [ extra-cmake-modules ];
  propagatedBuildInputs = [ networkmanager ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix
@ -1,4 +1,4 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , kactivities
 , karchive
@ -22,7 +22,7 @@
 , qtx11extras
 }:

-mkDerivation {
+kdeFramework {
  name = "plasma-framework";
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
--- a/pkgs/development/libraries/kde-frameworks-5.13/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/solid.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "solid";
  nativeBuildInputs = [ extra-cmake-modules ];
  postInstall = ''
--- a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix
@ -1,9 +1,9 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 , hunspell
 }:

-mkDerivation {
+kdeFramework {
  name = "sonnet";
  nativeBuildInputs = [ extra-cmake-modules ];
  buildInputs = [ hunspell ];
--- a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix
@ -1,8 +1,8 @@
-{ mkDerivation, lib
+{ kdeFramework, lib
 , extra-cmake-modules
 }:

-mkDerivation {
+kdeFramework {
  name = "threadweaver";
  nativeBuildInputs = [ extra-cmake-modules ];
  meta = {