diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-15 12:05:35 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-06-18 08:42:20 -0500 |
commit | 945758f96030ee7762ccdab32a3ffddd028b37b6 (patch) | |
tree | 03a0b4b4a3f69543de77bad73192fb0192d0485f /pkgs | |
parent | eaa644a5af59b1967fb464a61316a1004cb5e888 (diff) | |
download | nixpkgs-945758f96030ee7762ccdab32a3ffddd028b37b6.tar nixpkgs-945758f96030ee7762ccdab32a3ffddd028b37b6.tar.gz nixpkgs-945758f96030ee7762ccdab32a3ffddd028b37b6.tar.bz2 nixpkgs-945758f96030ee7762ccdab32a3ffddd028b37b6.tar.lz nixpkgs-945758f96030ee7762ccdab32a3ffddd028b37b6.tar.xz nixpkgs-945758f96030ee7762ccdab32a3ffddd028b37b6.tar.zst nixpkgs-945758f96030ee7762ccdab32a3ffddd028b37b6.zip |
kdeFrameworks: rename kdeFramework to mkDerivation
Diffstat (limited to 'pkgs')
74 files changed, 275 insertions, 240 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 6c120c20d3a..c70be1b877d 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase }: +{ mkDerivation, lib, extra-cmake-modules, qtbase }: -kdeFramework { +mkDerivation { name = "attica"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index dc7b6af193b..9bbb9a1101b 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig +{ mkDerivation, lib, extra-cmake-modules, kauth, kconfig , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime , kio, lmdb, qtbase, solid }: -kdeFramework { +mkDerivation { name = "baloo"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 261d9471a77..2f3b960f3bd 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , qtbase, qtdeclarative }: -kdeFramework { +mkDerivation { name = "bluez-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 9a18ade96a8..1c4ed2a9909 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, qtsvg }: +{ mkDerivation, lib, extra-cmake-modules, qtsvg }: -kdeFramework { +mkDerivation { name = "breeze-icons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; outputs = [ "out" ]; diff --git a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix deleted file mode 100644 index 04832cf5608..00000000000 --- a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ mkDerivation, lib, fetchurl }: - -let - mirror = "mirror://kde"; - srcs = import ../srcs.nix { inherit fetchurl mirror; }; -in - -args: - -let - inherit (args) name; - inherit (srcs."${name}") src version; -in mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - } // (args.meta or {}); -}) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index e5a765d7c16..abe17848f3b 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -27,14 +27,68 @@ existing packages here and modify it as necessary. { libsForQt5, lib, fetchurl }: let + + srcs = import ./srcs.nix { + inherit fetchurl; + mirror = "mirror://kde"; + }; + + mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + packages = self: with self; let + + propagateBin = + let setupHook = { writeScript }: + writeScript "setup-hook.sh" '' + # Propagate $bin output + propagatedUserEnvPkgs+=" @bin@" + + # Propagate $dev so that this setup hook is propagated + # But only if there is a separate $dev output + if [ "$outputDev" != out ]; then + if [ -n "$crossConfig" ]; then + propagatedBuildInputs+=" @dev@" + else + propagatedNativeBuildInputs+=" @dev@" + fi + fi + ''; + in callPackage setupHook {}; + callPackage = self.newScope { - kdeFramework = import ./build-support/framework.nix { - inherit lib fetchurl; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; - }; + + inherit propagateBin; + + mkDerivation = args: + let + + inherit (args) name; + inherit (srcs."${name}") src version; + + outputs = args.outputs or [ "out" "dev" "bin" ]; + hasBin = lib.elem "bin" outputs; + hasDev = lib.elem "dev" outputs; + + defaultSetupHook = if hasBin && hasDev then propagateBin else null; + setupHook = args.setupHook or defaultSetupHook; + + meta = { + homepage = "http://www.kde.org"; + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + maintainers = [ lib.maintainers.ttuegel ]; + platforms = lib.platforms.linux; + } // (args.meta or {}); + + in mkDerivation (args // { + name = "${name}-${version}"; + inherit meta outputs setupHook src; + }); + }; + in { attica = callPackage ./attica.nix {}; baloo = callPackage ./baloo.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 f8a774b6855..dfdb6a11803 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig }: +{ mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }: -kdeFramework { +mkDerivation { name = "extra-cmake-modules"; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index 325758bf91d..8f2d1446fcf 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,11 +1,11 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras }: -kdeFramework { +mkDerivation { name = "frameworkintegration"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 25188b009b6..99737ea2b83 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kactivities, kconfig }: +{ mkDerivation, lib, extra-cmake-modules, boost, kactivities, kconfig }: -kdeFramework { +mkDerivation { name = "kactivities-stats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index 167c3f15bbd..59b5639c24f 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig +{ mkDerivation, lib, extra-cmake-modules, boost, kcmutils, kconfig , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n , kio, kservice, kwindowsystem, kxmlgui, qtdeclarative }: -kdeFramework { +mkDerivation { name = "kactivities"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix index 749cf9b2970..0d3ccc276fc 100644 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, python }: +{ mkDerivation, lib, extra-cmake-modules, python }: -kdeFramework { +mkDerivation { name = "kapidox"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules python ]; diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 71561b1109c..5f725a75d56 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase }: +{ mkDerivation, lib, extra-cmake-modules, qtbase }: -kdeFramework { +mkDerivation { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 7561575ae84..25cdb7f4a19 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,6 +1,9 @@ -{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }: +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, kcoreaddons, polkit-qt, qttools +}: -kdeFramework { +mkDerivation { name = "kauth"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index 36ea7405842..0873094af3d 100644 --- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -1,9 +1,9 @@ { - kdeFramework, lib, extra-cmake-modules, + mkDerivation, lib, extra-cmake-modules, kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui }: -kdeFramework { +mkDerivation { name = "kbookmarks"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index fdf55174548..fb5779e10bc 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -1,9 +1,11 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets -, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews -, kpackage, kservice, kxmlgui +{ + mkDerivation, lib, + extra-cmake-modules, + kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews, + kpackage, kservice, kxmlgui }: -kdeFramework { +mkDerivation { name = "kcmutils"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index fa1679519cc..f66c422a638 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "kcodecs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index f143524889a..bf7556e94a6 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,9 +1,12 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }: +{ + mkDerivation, lib, + extra-cmake-modules, + kconfig, kwidgetsaddons, qtbase, qttools +}: -kdeFramework { +mkDerivation { name = "kcompletion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ kconfig kwidgetsaddons ]; + propagatedBuildInputs = [ kconfig kwidgetsaddons qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index f6d38cd2336..f95b50f9de5 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,11 +1,11 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index c44473bb915..2b91e003764 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -1,9 +1,9 @@ { - kdeFramework, lib, extra-cmake-modules, + mkDerivation, lib, extra-cmake-modules, kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons }: -kdeFramework { +mkDerivation { name = "kconfigwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 4d35c0bbdea..8fa10bd767b 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,12 +1,11 @@ -{ kdeFramework, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }: +{ mkDerivation, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }: -kdeFramework { +mkDerivation { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; - propagatedBuildInputs = [ shared_mime_info ]; + propagatedBuildInputs = [ qtbase shared_mime_info ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index bd008c732af..c8e674c88c5 100644 --- a/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }: +{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }: -kdeFramework { +mkDerivation { name = "kcrash"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index 2bbbf65f898..8169c89b5ba 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }: -kdeFramework { +mkDerivation { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 05eaffb9fbf..4b9522ffa5d 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, extra-cmake-modules, + mkDerivation, lib, extra-cmake-modules, epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative }: -kdeFramework { +mkDerivation { name = "kdeclarative"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 2da1bac8f39..18b8ccd0fb6 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,9 +1,9 @@ { - kdeFramework, lib, extra-cmake-modules, + mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice }: -kdeFramework { +mkDerivation { name = "kded"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 1174972917e..cf94a706167 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,16 +1,15 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, docbook_xml_dtd_45, kauth -, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels -, kinit, knotifications, kparts, kservice, ktextwidgets -, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui -, networkmanager, qtsvg, qtx11extras, xlibs +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, kdoctools, + docbook_xml_dtd_45, kauth, karchive, kcompletion, kconfig, kconfigwidgets, + kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons, + kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels, kinit, + knotifications, kparts, kservice, ktextwidgets, kunitconversion, + kwidgetsaddons, kwindowsystem, kxmlgui, networkmanager, qtsvg, qtx11extras, + xlibs }: -# TODO: debug docbook detection - -kdeFramework { +mkDerivation { name = "kdelibs4support"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index 8e17a1a60c8..c732a6be22e 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -1,21 +1,11 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdoctools -, kiconthemes -, kio -, kitemviews -, kplotting -, ktextwidgets -, kwidgetsaddons -, kxmlgui -, sonnet +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools, + kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio, + kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, sonnet }: -kdeFramework { +mkDerivation { name = "kdesignerplugin"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix index fcccea9161f..e8d72008507 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty +{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty , kservice }: -kdeFramework { +mkDerivation { name = "kdesu"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 18a435139f6..1d7553090fc 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -1,15 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules, qttools -, avahi, qtbase +{ + mkDerivation, lib, + extra-cmake-modules, qttools, + avahi, qtbase }: -kdeFramework { +mkDerivation { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; - propagatedBuildInputs = [ avahi ]; - buildInputs = [ qtbase ]; + propagatedBuildInputs = [ avahi qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 99fc4c7d023..991717cce8c 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,8 +1,10 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, perl, perlPackages +{ + mkDerivation, lib, + extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl, + karchive, ki18n, perl, perlPackages }: -kdeFramework { +mkDerivation { name = "kdoctools"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix index 1e31277172d..c2060e9c919 100644 --- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix @@ -1,12 +1,10 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kcoreaddons -, kservice +{ + mkDerivation, lib, + extra-cmake-modules, + karchive, kconfig, kcoreaddons, kservice }: -kdeFramework { +mkDerivation { name = "kemoticons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index bc7349e7453..3fb81c28a7b 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,8 +1,10 @@ -{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules -, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, + attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib }: -kdeFramework { +mkDerivation { name = "kfilemetadata"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 1c1336dd4d0..cfe767b4d55 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,10 +1,11 @@ { - kdeFramework, lib, extra-cmake-modules, + mkDerivation, lib, + extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, qtx11extras }: -kdeFramework { +mkDerivation { name = "kglobalaccel"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index f93aa0967f6..2b4e28ca492 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, qtbase, qtx11extras, }: -kdeFramework { +mkDerivation { name = "kguiaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 99f6fe31e0d..d6ec1ab901f 100644 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -1,10 +1,12 @@ -{ kdeFramework, lib, extra-cmake-modules, giflib, karchive -, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs -, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons -, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet +{ + mkDerivation, lib, + extra-cmake-modules, perl, + giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs, + knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, + kxmlgui, phonon, qtx11extras, sonnet }: -kdeFramework { +mkDerivation { name = "khtml"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules perl ]; diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 68f29c8314f..649f1db3952 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, gettext, python, qtbase, qtdeclarative, qtscript, }: -kdeFramework { +mkDerivation { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 6102bb0d4b5..f1d8503804e 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,9 +1,10 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules -, karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, + karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg }: -kdeFramework { +mkDerivation { name = "kiconthemes"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index bfec344ca11..4139674cd39 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtbase -, qtx11extras +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase, qtx11extras }: -kdeFramework { +mkDerivation { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 2a8e825893b..b711328cf89 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, ilmbase, karchive, qtbase }: -kdeFramework { +mkDerivation { name = "kimageformats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index f5cfa166e91..51c0e40617a 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -1,13 +1,12 @@ { - kdeFramework, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, kdoctools, kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework }: -let - inherit (lib) getLib; -in -kdeFramework { +let inherit (lib) getLib; in + +mkDerivation { name = "kinit"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 3f4ae5a25c2..86cb72707a5 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,13 +1,13 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, acl, karchive -, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons -, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews -, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui -, qtscript, qtx11extras, solid, fetchpatch +{ + mkDerivation, lib, copyPathsToStore, + extra-cmake-modules, kdoctools, + acl, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, + kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, + kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, + qtscript, qtx11extras, solid, fetchpatch }: -kdeFramework { +mkDerivation { name = "kio"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index e2f0633da8c..a769d30b3c3 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -1,13 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules, qtbase +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase }: -kdeFramework { +mkDerivation { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index df420f8f4b9..7e317deef58 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,13 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules, qtbase, qttools +{ + mkDerivation, lib, + extra-cmake-modules, + qtbase, qttools }: -kdeFramework { +mkDerivation { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; broken = builtins.compareVersions qtbase.version "5.6.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; - buildInputs = [ qtbase ]; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index ddc66d2eb20..048f1290a99 100644 --- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -1,11 +1,10 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwidgetsaddons -, qttools, qtx11extras +{ + mkDerivation, lib, + extra-cmake-modules, qttools, + kcoreaddons, kwidgetsaddons, qtx11extras }: -kdeFramework { +mkDerivation { name = "kjobwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index abdc15ce8df..20459498c3e 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools +{ + mkDerivation, lib, + extra-cmake-modules, kdoctools }: -kdeFramework { +mkDerivation { name = "kjs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix index 95bc02422f1..3a52761e259 100644 --- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix @@ -1,8 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs +{ + mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kjs , qtsvg }: -kdeFramework { +mkDerivation { name = "kjsembed"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index 93a6b450f76..278a4240ab9 100644 --- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , kparts , kxmlgui }: -kdeFramework { +mkDerivation { name = "kmediaplayer"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix index 002418c65ad..b32a073fb33 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, karchive +{ mkDerivation, lib, extra-cmake-modules, attica, karchive , kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio , kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui }: -kdeFramework { +mkDerivation { name = "knewstuff"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index c1c07957872..2532f5b4b4f 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , kcodecs, kconfig, kcoreaddons, kwindowsystem , libdbusmenu @@ -6,7 +6,7 @@ , qttools, qtx11extras }: -kdeFramework { +mkDerivation { name = "knotifications"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index 0e357aecb99..29c779e6598 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig , ki18n, kio, phonon }: -kdeFramework { +mkDerivation { name = "knotifyconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 2953aea9a55..e83afaa8e82 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,10 +1,10 @@ { - kdeFramework, fetchurl, lib, copyPathsToStore, + mkDerivation, fetchurl, lib, copyPathsToStore, extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n }: -kdeFramework { +mkDerivation { name = "kpackage"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix index ad6ea2dbc30..db0eb6c2a2c 100644 --- a/pkgs/development/libraries/kde-frameworks/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks/kparts.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons , ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice , ktextwidgets, kwidgetsaddons, kxmlgui }: -kdeFramework { +mkDerivation { name = "kparts"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix index 6acb5e2eed5..e10abf6ab62 100644 --- a/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n +{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n , kitemviews, kservice, kwidgetsaddons, qtdeclarative }: -kdeFramework { +mkDerivation { name = "kpeople"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index e132a45976f..a0d6b4625d9 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules, qtbase }: -kdeFramework { +mkDerivation { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix index 8bdaacb85f8..27acf536c36 100644 --- a/pkgs/development/libraries/kde-frameworks/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks/kpty.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: +{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n }: -kdeFramework { +mkDerivation { name = "kpty"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix index 0e66d95b5cc..6b37c118183 100644 --- a/pkgs/development/libraries/kde-frameworks/kross.nix +++ b/pkgs/development/libraries/kde-frameworks/kross.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons +{ mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons , kxmlgui, qtscript }: -kdeFramework { +mkDerivation { name = "kross"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index ec9ab7abe9f..2f542591e49 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons , ki18n, kio, kservice, plasma-framework, solid , threadweaver }: -kdeFramework { +mkDerivation { name = "krunner"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 2751a7f5d6e..2730cf53677 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem }: -kdeFramework { +mkDerivation { name = "kservice"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ]; diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index fbd73c65eff..bc4dcf6916b 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, copyPathsToStore +{ mkDerivation, lib, copyPathsToStore , extra-cmake-modules, perl , karchive, kconfig, kguiaddons, kiconthemes, kparts , libgit2 @@ -6,7 +6,7 @@ , ki18n, kio, sonnet, syntax-highlighting }: -kdeFramework { +mkDerivation { name = "ktexteditor"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules perl ]; diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 25954c60397..695e7b991e7 100644 --- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig , kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem , sonnet }: -kdeFramework { +mkDerivation { name = "ktextwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index c04ded722aa..e793bb8828f 100644 --- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n }: +{ mkDerivation, lib, extra-cmake-modules, ki18n }: -kdeFramework { +mkDerivation { name = "kunitconversion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index 48181040a75..31a29dbff92 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets +{ mkDerivation, lib, extra-cmake-modules, kconfig, kconfigwidgets , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme }: -kdeFramework { +mkDerivation { name = "kwallet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index d34687def3e..87c0bf84706 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, + mkDerivation, lib, extra-cmake-modules, qtbase, wayland }: -kdeFramework { +mkDerivation { name = "kwayland"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index ce16e280faa..4375cf064e1 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 4e02777e39c..6fe57449b89 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, copyPathsToStore, + mkDerivation, lib, copyPathsToStore, extra-cmake-modules, qtbase, qttools, qtx11extras }: -kdeFramework { +mkDerivation { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index ea800bf58ae..80df93c61b8 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, kconfig +{ mkDerivation, lib, extra-cmake-modules, attica, kconfig , kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews , ktextwidgets, kwindowsystem, sonnet }: -kdeFramework { +mkDerivation { name = "kxmlgui"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index f20f4a22394..714d768742e 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix @@ -1,6 +1,6 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: +{ mkDerivation, lib, extra-cmake-modules, ki18n, kio }: -kdeFramework { +mkDerivation { name = "kxmlrpcclient"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index ea2e112ff67..c4edfeca5a3 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , modemmanager, qtbase }: -kdeFramework { +mkDerivation { name = "modemmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 80085bb2072..340c76ef778 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , qtbase, networkmanager }: -kdeFramework { +mkDerivation { name = "networkmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 1d45b51274c..919c4f36b15 100644 --- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix @@ -1,9 +1,9 @@ -{ kdeFramework +{ mkDerivation , lib , extra-cmake-modules, qtbase }: -kdeFramework { +mkDerivation { name = "oxygen-icons5"; meta = { license = lib.licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 2fd667af0dc..f47750145b5 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,11 +1,11 @@ -{ kdeFramework, lib, fetchurl, extra-cmake-modules, kactivities, karchive +{ mkDerivation, lib, fetchurl, extra-cmake-modules, kactivities, karchive , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui , qtscript, qtx11extras }: -kdeFramework { +mkDerivation { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index d32acf598eb..f64b9936046 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,10 +1,10 @@ { - kdeFramework, lib, + mkDerivation, lib, bison, extra-cmake-modules, flex, qtbase, qtdeclarative, qttools }: -kdeFramework { +mkDerivation { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index ae3e72e2a46..06165a57c3a 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules , hunspell, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index f199321e674..ebc33a8346e 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules, perl, qtbase, qttools }: -kdeFramework { +mkDerivation { name = "syntax-highlighting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index 4df3ff510cb..3afedf18ecb 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib +{ mkDerivation, lib , extra-cmake-modules, qtbase }: -kdeFramework { +mkDerivation { name = "threadweaver"; meta = { maintainers = [ lib.maintainers.ttuegel ]; |