diff --git a/pkgs/development/libraries/kde-frameworks-5.13/attica.nix b/pkgs/development/libraries/kde-frameworks-5.13/attica.nix index 067a9b0a8f2..98721876c12 100644 --- 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 = { diff --git a/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.13/baloo.nix index 8c82002348f..8b6b3509f0d 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/bluez-qt.nix index 978b6af4126..f981b0516f7 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/default.nix index e35aac08a28..1ff433c13c8 100644 --- 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 diff --git 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 index 2bf9df33b3c..4d669b72a89 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.13/frameworkintegration.nix index 11e0d6e6f3b..ad30cc87ecf 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.13/kactivities.nix index 81bc0949cbf..c8e296bad80 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.13/kapidox.nix index a1fe75bafb9..647be8f052c 100644 --- 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 = { diff --git a/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.13/karchive.nix index 7b09c171543..a8d9a0003c3 100644 --- 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 = { diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kauth/default.nix index 29b539de96e..42a10019334 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.13/kbookmarks.nix index ad9e30928bc..1a469ab4db6 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcmutils/default.nix index 93170e440f8..ac7a5af06a4 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcodecs.nix index 2e6106ef3f1..53a69a69b69 100644 --- 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 = { diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcompletion.nix index 94624933f43..e393774f16a 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.13/kconfig.nix index fc8ae724470..ce890745767 100644 --- 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 = '' diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kconfigwidgets/default.nix index 14e838fc6fd..d16f7f92bea 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcoreaddons.nix index eef70e9f628..43c21bb51ef 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.13/kcrash.nix index f51b6ba80cf..b919c7ad222 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdbusaddons.nix index 3950a422583..eb76e14705e 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdeclarative.nix index 8ef33e283bf..b62a13f8fa9 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kded.nix b/pkgs/development/libraries/kde-frameworks-5.13/kded.nix index b0eb1e3da9f..47ae2d68c68 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdelibs4support.nix index b4f180f8c42..f54fa3e9be6 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdesignerplugin.nix index da5c732f33c..100d16d64bc 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdesu.nix index cf67a0d7d08..4503d8bcd10 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdewebkit.nix index 841e982d0e2..52ae0162b86 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdnssd.nix index 960e0db4792..f00432b0c9c 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kdoctools/default.nix index 74f28113873..0ec13d1a15c 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kemoticons.nix index aa7962bfe52..d165f84e3a2 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.13/kfilemetadata.nix index 673c76e581c..53c509417f2 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.13/kglobalaccel.nix index 11bcfc9576d..f7c5ea56266 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kguiaddons.nix index ccb46f4acca..bc4e9ab1184 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.13/khtml.nix index f0b2d8ca3cd..45dd45089c4 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.13/ki18n.nix index e77bf687b74..915e3294b46 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.13/kiconthemes.nix index f093b3f9dec..862c17f104f 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.13/kidletime.nix index 4e5073f2b73..fc086560023 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.13/kimageformats.nix index 019e7ab42be..49d66bbcc2c 100644 --- 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"; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kinit/default.nix index fd518bc9360..47f1aec72de 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kio.nix b/pkgs/development/libraries/kde-frameworks-5.13/kio.nix index d6d2968bed0..6605de03e38 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.13/kitemmodels.nix index f82f9fdf14a..a9024d771cc 100644 --- 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 = { diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.13/kitemviews.nix index 45888b9e7e3..931019ce495 100644 --- 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 = { diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjobwidgets.nix index 32103bbc0d7..c3f1d37f858 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjs.nix index de473062c23..902674d49b7 100644 --- 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 = '' diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.13/kjsembed.nix index e7e74ba6126..bbc5169a1cc 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.13/kmediaplayer.nix index 7ab5700a5e8..460458b2232 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.13/knewstuff.nix index 5128f31270d..d0b884f8f68 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.13/knotifications.nix index c43598311a1..f3aa29f018c 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.13/knotifyconfig.nix index b06539c3f01..f6509a166d4 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpackage/default.nix index 9250c769efc..f7c3689503b 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.13/kparts.nix index 65ddf9b6483..96c1b984ab7 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpeople.nix index b5794bc6e89..ffc028d97c3 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.13/kplotting.nix index 41896853f64..c16f51b5ac3 100644 --- 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 = { diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.13/kpty.nix index 67b04af7156..72ac842a00a 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kross.nix b/pkgs/development/libraries/kde-frameworks-5.13/kross.nix index d4025f9960f..ca14e9827e2 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.13/krunner.nix index 24f9c86d39e..618494ef5c5 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/kservice/default.nix index 40b8335f9b9..b46797f5e0e 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/ktexteditor/default.nix index f6df912b902..8c02e602c5d 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.13/ktextwidgets.nix index 006e5c114bd..e27839162ef 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.13/kunitconversion.nix index 169b931ad2b..6c6a4caeb98 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwallet.nix index 6b8ddbc70e8..267ddf8303d 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwidgetsaddons.nix index ce68adb521d..d95f44d3fec 100644 --- 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 = { diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.13/kwindowsystem.nix index 37d536b8363..09ab1f2200d 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.13/kxmlgui.nix index c90900be82d..6e1398d2f84 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.13/kxmlrpcclient.nix index fae7cf7b89d..b28c00a33be 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/modemmanager-qt.nix index 44f15d17ef9..7d7f769d6a9 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.13/networkmanager-qt.nix index 4e8d77f102d..333378bd143 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.13/plasma-framework/default.nix index b6d76e4f31a..d838996f99c 100644 --- 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 = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.13/solid.nix b/pkgs/development/libraries/kde-frameworks-5.13/solid.nix index e5ea33fcf38..06b0797cbc1 100644 --- 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 = '' diff --git a/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.13/sonnet.nix index f5f8ea20a6a..943fe04a1c9 100644 --- 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 ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.13/threadweaver.nix index 9c7f76dd051..52817921cc7 100644 --- 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 = {