diff options
Diffstat (limited to 'pkgs/development/libraries/kde-frameworks')
75 files changed, 274 insertions, 259 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index d34b3f3a2c5fc..6533a05b16020 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -1,7 +1,8 @@ -{ kdeFramework, lib, ecm }: +{ kdeFramework, lib, extra-cmake-modules, qtbase }: kdeFramework { name = "attica"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 9c803fdc7176c..dc7b6af193bcf 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kauth, kconfig +{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime , kio, lmdb, qtbase, solid }: @@ -6,7 +6,7 @@ kdeFramework { name = "baloo"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio kidletime lmdb qtbase solid diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 7ab82bdc1ef50..93c945b58ca4a 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -1,12 +1,12 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , qtdeclarative }: kdeFramework { name = "bluez-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtdeclarative ]; preConfigure = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index c87ba75b2b46c..9a18ade96a80c 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib, ecm, qtsvg }: +{ kdeFramework, lib, extra-cmake-modules, qtsvg }: kdeFramework { name = "breeze-icons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; outputs = [ "out" ]; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtsvg ]; propagatedUserEnvPkgs = [ qtsvg.out ]; } diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 00965bd0a582d..2906dc7888653 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -24,87 +24,89 @@ existing packages here and modify it as necessary. */ -{ newScope, kdeDerivation, lib, fetchurl }: +{ libsForQt5, kdeDerivation, lib, fetchurl }: let - callPackage = newScope { - kdeFramework = import ./build-support/framework.nix { - inherit kdeDerivation lib fetchurl; + packages = self: with self; + let + callPackage = self.newScope { + kdeFramework = import ./build-support/framework.nix { + inherit kdeDerivation lib fetchurl; + }; + }; + in { + attica = callPackage ./attica.nix {}; + baloo = callPackage ./baloo.nix {}; + bluez-qt = callPackage ./bluez-qt.nix {}; + breeze-icons = callPackage ./breeze-icons.nix {}; + extra-cmake-modules = callPackage ./extra-cmake-modules {}; + frameworkintegration = callPackage ./frameworkintegration.nix {}; + kactivities = callPackage ./kactivities.nix {}; + kactivities-stats = callPackage ./kactivities-stats.nix {}; + kapidox = callPackage ./kapidox.nix {}; + karchive = callPackage ./karchive.nix {}; + kauth = callPackage ./kauth {}; + kbookmarks = callPackage ./kbookmarks.nix {}; + kcmutils = callPackage ./kcmutils {}; + kcodecs = callPackage ./kcodecs.nix {}; + kcompletion = callPackage ./kcompletion.nix {}; + kconfig = callPackage ./kconfig.nix {}; + kconfigwidgets = callPackage ./kconfigwidgets {}; + kcoreaddons = callPackage ./kcoreaddons.nix {}; + kcrash = callPackage ./kcrash.nix {}; + kdbusaddons = callPackage ./kdbusaddons.nix {}; + kdeclarative = callPackage ./kdeclarative.nix {}; + kded = callPackage ./kded.nix {}; + kdelibs4support = callPackage ./kdelibs4support {}; + kdesignerplugin = callPackage ./kdesignerplugin.nix {}; + kdesu = callPackage ./kdesu.nix {}; + kdnssd = callPackage ./kdnssd.nix {}; + kdoctools = callPackage ./kdoctools {}; + kemoticons = callPackage ./kemoticons.nix {}; + kfilemetadata = callPackage ./kfilemetadata {}; + kglobalaccel = callPackage ./kglobalaccel.nix {}; + kguiaddons = callPackage ./kguiaddons.nix {}; + khtml = callPackage ./khtml.nix {}; + ki18n = callPackage ./ki18n.nix {}; + kiconthemes = callPackage ./kiconthemes {}; + kidletime = callPackage ./kidletime.nix {}; + kimageformats = callPackage ./kimageformats.nix {}; + kinit = callPackage ./kinit {}; + kio = callPackage ./kio {}; + kitemmodels = callPackage ./kitemmodels.nix {}; + kitemviews = callPackage ./kitemviews.nix {}; + kjobwidgets = callPackage ./kjobwidgets.nix {}; + kjs = callPackage ./kjs.nix {}; + kjsembed = callPackage ./kjsembed.nix {}; + kmediaplayer = callPackage ./kmediaplayer.nix {}; + knewstuff = callPackage ./knewstuff.nix {}; + knotifications = callPackage ./knotifications.nix {}; + knotifyconfig = callPackage ./knotifyconfig.nix {}; + kpackage = callPackage ./kpackage {}; + kparts = callPackage ./kparts.nix {}; + kpeople = callPackage ./kpeople.nix {}; + kplotting = callPackage ./kplotting.nix {}; + kpty = callPackage ./kpty.nix {}; + kross = callPackage ./kross.nix {}; + krunner = callPackage ./krunner.nix {}; + kservice = callPackage ./kservice {}; + ktexteditor = callPackage ./ktexteditor.nix {}; + ktextwidgets = callPackage ./ktextwidgets.nix {}; + kunitconversion = callPackage ./kunitconversion.nix {}; + kwallet = callPackage ./kwallet.nix {}; + kwayland = callPackage ./kwayland.nix {}; + kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; + kwindowsystem = callPackage ./kwindowsystem.nix {}; + kxmlgui = callPackage ./kxmlgui.nix {}; + kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; + modemmanager-qt = callPackage ./modemmanager-qt.nix {}; + networkmanager-qt = callPackage ./networkmanager-qt.nix {}; + oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; + plasma-framework = callPackage ./plasma-framework.nix {}; + solid = callPackage ./solid.nix {}; + sonnet = callPackage ./sonnet.nix {}; + syntax-highlighting = callPackage ./syntax-highlighting.nix {}; + threadweaver = callPackage ./threadweaver.nix {}; }; - }; -in -{ - attica = callPackage ./attica.nix {}; - baloo = callPackage ./baloo.nix {}; - bluez-qt = callPackage ./bluez-qt.nix {}; - breeze-icons = callPackage ./breeze-icons.nix {}; - ecm = callPackage ./extra-cmake-modules {}; - ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix { }; - frameworkintegration = callPackage ./frameworkintegration.nix {}; - kactivities = callPackage ./kactivities.nix {}; - kactivities-stats = callPackage ./kactivities-stats.nix {}; - kapidox = callPackage ./kapidox.nix {}; - karchive = callPackage ./karchive.nix {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs.nix {}; - kcompletion = callPackage ./kcompletion.nix {}; - kconfig = callPackage ./kconfig.nix {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcoreaddons = callPackage ./kcoreaddons.nix {}; - kcrash = callPackage ./kcrash.nix {}; - kdbusaddons = callPackage ./kdbusaddons.nix {}; - kdeclarative = callPackage ./kdeclarative.nix {}; - kded = callPackage ./kded.nix {}; - kdelibs4support = callPackage ./kdelibs4support {}; - kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdesu = callPackage ./kdesu.nix {}; - kdnssd = callPackage ./kdnssd.nix {}; - kdoctools = callPackage ./kdoctools {}; - kemoticons = callPackage ./kemoticons.nix {}; - kfilemetadata = callPackage ./kfilemetadata {}; - kglobalaccel = callPackage ./kglobalaccel.nix {}; - kguiaddons = callPackage ./kguiaddons.nix {}; - khtml = callPackage ./khtml.nix {}; - ki18n = callPackage ./ki18n.nix {}; - kiconthemes = callPackage ./kiconthemes {}; - kidletime = callPackage ./kidletime.nix {}; - kimageformats = callPackage ./kimageformats.nix {}; - kinit = callPackage ./kinit {}; - kio = callPackage ./kio {}; - kitemmodels = callPackage ./kitemmodels.nix {}; - kitemviews = callPackage ./kitemviews.nix {}; - kjobwidgets = callPackage ./kjobwidgets.nix {}; - kjs = callPackage ./kjs.nix {}; - kjsembed = callPackage ./kjsembed.nix {}; - kmediaplayer = callPackage ./kmediaplayer.nix {}; - knewstuff = callPackage ./knewstuff.nix {}; - knotifications = callPackage ./knotifications.nix {}; - knotifyconfig = callPackage ./knotifyconfig.nix {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts.nix {}; - kpeople = callPackage ./kpeople.nix {}; - kplotting = callPackage ./kplotting.nix {}; - kpty = callPackage ./kpty.nix {}; - kross = callPackage ./kross.nix {}; - krunner = callPackage ./krunner.nix {}; - kservice = callPackage ./kservice {}; - ktexteditor = callPackage ./ktexteditor.nix {}; - ktextwidgets = callPackage ./ktextwidgets.nix {}; - kunitconversion = callPackage ./kunitconversion.nix {}; - kwallet = callPackage ./kwallet.nix {}; - kwayland = callPackage ./kwayland.nix {}; - kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; - kwindowsystem = callPackage ./kwindowsystem.nix {}; - kxmlgui = callPackage ./kxmlgui.nix {}; - kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; - modemmanager-qt = callPackage ./modemmanager-qt.nix {}; - networkmanager-qt = callPackage ./networkmanager-qt.nix {}; - oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; - plasma-framework = callPackage ./plasma-framework.nix {}; - solid = callPackage ./solid.nix {}; - sonnet = callPackage ./sonnet.nix {}; - syntax-highlighting = callPackage ./syntax-highlighting.nix {}; - threadweaver = callPackage ./threadweaver.nix {}; -} + +in lib.makeScope libsForQt5.newScope packages 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 6c0919a23619f..b2e3a371e9654 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,20 @@ -{ makeSetupHook, lib, cmake, ecmNoHooks, pkgconfig, qtbase, qttools }: +{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig }: -makeSetupHook { - deps = lib.chooseDevOutputs [ cmake ecmNoHooks pkgconfig qtbase qttools ]; +kdeFramework { + name = "extra-cmake-modules"; + + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + + outputs = [ "out" ]; # this package has no runtime components + + propagatedNativeBuildInputs = [ cmake pkgconfig ]; + + setupHook = ./setup-hook.sh; + + meta = with lib; { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + license = licenses.bsd2; + maintainers = [ maintainers.ttuegel ]; + }; } -./setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix deleted file mode 100644 index 855d6bdb3d257..0000000000000 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore, cmake }: - -kdeFramework { - name = "extra-cmake-modules"; - - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - - outputs = [ "out" ]; # this package has no runtime components - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - platforms = lib.platforms.linux; - homepage = "http://www.kde.org"; - license = licenses.bsd2; - maintainers = [ maintainers.ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index a1638ca541be5..9ee9ef90a44b3 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh @@ -1,6 +1,6 @@ _ecmSetXdgDirs() { - addToSearchPathOnce XDG_DATA_DIRS "$1/share" - addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg" + addToSearchPath XDG_DATA_DIRS "$1/share" + addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" } envHooks+=(_ecmSetXdgDirs) diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index 029a661601dfb..325758bf91db4 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,6 +1,6 @@ { kdeFramework, lib, - ecm, + extra-cmake-modules, kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras }: @@ -8,7 +8,7 @@ kdeFramework { name = "frameworkintegration"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 4f406376faa7d..25188b009b62f 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, ecm, boost, kactivities, kconfig }: +{ kdeFramework, lib, extra-cmake-modules, boost, kactivities, kconfig }: kdeFramework { name = "kactivities-stats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ boost kactivities kconfig ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index a2cacd4b257db..167c3f15bbda2 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, boost, kcmutils, kconfig +{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n , kio, kservice, kwindowsystem, kxmlgui, qtdeclarative }: @@ -6,7 +6,7 @@ kdeFramework { name = "kactivities"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel ki18n kio kservice kwindowsystem kxmlgui qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix index f6c60b7731e17..749cf9b297096 100644 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -1,7 +1,7 @@ -{ kdeFramework, lib, ecm, python }: +{ kdeFramework, lib, extra-cmake-modules, python }: kdeFramework { name = "kapidox"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm python ]; + nativeBuildInputs = [ extra-cmake-modules python ]; } diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 265df45800f17..ca3321bef8494 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,7 +1,8 @@ -{ kdeFramework, lib, ecm }: +{ kdeFramework, lib, extra-cmake-modules, qtbase }: kdeFramework { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index f2a1c7717d5d5..7561575ae84e0 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,9 +1,9 @@ -{ kdeFramework, lib, copyPathsToStore, ecm, kcoreaddons, polkit-qt }: +{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }: kdeFramework { name = "kauth"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ kcoreaddons polkit-qt ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index 50cec5a39c865..36ea740584292 100644 --- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -1,12 +1,12 @@ { - kdeFramework, lib, ecm, + kdeFramework, lib, extra-cmake-modules, kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui }: kdeFramework { name = "kbookmarks"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index dd1af737d68ef..fdf55174548e3 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kconfigwidgets +{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets , kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews , kpackage, kservice, kxmlgui }: @@ -6,7 +6,7 @@ kdeFramework { name = "kcmutils"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kservice kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index a3fcd3023f522..482c30b7b57e6 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,7 +1,8 @@ -{ kdeFramework, lib, ecm }: +{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }: kdeFramework { name = "kcodecs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index 893f374933ea3..f143524889ad9 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,8 +1,9 @@ -{ kdeFramework, lib, ecm, kconfig, kwidgetsaddons }: +{ kdeFramework, lib, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }: kdeFramework { name = "kcompletion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ kconfig kwidgetsaddons ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 0f003f8ea97e3..981256e75bf6c 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,7 +1,8 @@ -{ kdeFramework, lib, ecm }: +{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }: kdeFramework { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index b88308b634c02..c44473bb915ee 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -1,12 +1,12 @@ { - kdeFramework, lib, ecm, + kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons }: kdeFramework { name = "kconfigwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index ca8c521894bda..f5d04a30b1ae4 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,8 +1,9 @@ -{ kdeFramework, lib, fetchurl, ecm, shared_mime_info }: +{ kdeFramework, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }: kdeFramework { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ shared_mime_info ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index 2fcadc828cf46..bd008c732af78 100644 --- a/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, ecm, kcoreaddons, kwindowsystem, qtx11extras }: +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }: kdeFramework { name = "kcrash"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index 6632005166048..bc5aeff556d8a 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, ecm, qtx11extras }: +{ kdeFramework, lib, extra-cmake-modules, qttools, qtx11extras }: kdeFramework { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index a90a419d9b84f..05eaffb9fbf64 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,5 +1,5 @@ { - kdeFramework, lib, ecm, + kdeFramework, lib, extra-cmake-modules, epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative }: @@ -7,7 +7,7 @@ kdeFramework { name = "kdeclarative"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage kwidgetsaddons kwindowsystem qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index d8fe820518d33..2da1bac8f39c5 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,12 +1,12 @@ { - kdeFramework, lib, ecm, + kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice }: kdeFramework { name = "kded"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index f3fd315e5500b..1174972917e45 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, ecm, docbook_xml_dtd_45, kauth +, 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 @@ -15,7 +15,7 @@ kdeFramework { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); setupHook = ./setup-hook.sh; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index e87bb5bf9d010..8e17a1a60c8dd 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , kcompletion , kconfig , kconfigwidgets @@ -18,7 +18,7 @@ kdeFramework { name = "kdesignerplugin"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix index 0c5cb85cc4940..fcccea9161f19 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib, ecm, kcoreaddons, ki18n, kpty +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty , kservice }: kdeFramework { name = "kdesu"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 49fd368fccbfd..ad86b660c747f 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -1,11 +1,12 @@ { kdeFramework, lib -, ecm -, avahi +, extra-cmake-modules, qttools +, avahi, qtbase }: kdeFramework { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ avahi ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 4a31ea5396dfa..99fc4c7d023c6 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,11 +1,11 @@ -{ kdeFramework, lib, ecm, docbook_xml_dtd_45 +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 , docbook5_xsl, karchive, ki18n, perl, perlPackages }: kdeFramework { name = "kdoctools"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ karchive ki18n ]; propagatedNativeBuildInputs = [ perl perlPackages.URI ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix index cdffbd5035762..1e31277172d72 100644 --- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , karchive , kconfig , kcoreaddons @@ -9,6 +9,6 @@ kdeFramework { name = "kemoticons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 31f692deca647..bc7349e7453f4 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, copyPathsToStore, ecm +{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules , attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib }: @@ -6,7 +6,7 @@ kdeFramework { name = "kfilemetadata"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib ]; diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index bbb480c31658a..1c1336dd4d0fd 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,5 +1,5 @@ { - kdeFramework, lib, ecm, + kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, qtx11extras }: @@ -7,7 +7,7 @@ kdeFramework { name = "kglobalaccel"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 9f20ecd598a4f..6ebfd1104f700 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , qtx11extras }: kdeFramework { name = "kguiaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index be1094b7cf5ab..99f6fe31e0d7c 100644 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, giflib, karchive +{ kdeFramework, lib, extra-cmake-modules, giflib, karchive , kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs , knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons , kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet @@ -7,7 +7,7 @@ kdeFramework { name = "khtml"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm perl ]; + nativeBuildInputs = [ extra-cmake-modules perl ]; propagatedBuildInputs = [ giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index cf2212413bd2d..2698a97fd33f9 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , gettext , python , qtdeclarative @@ -9,7 +9,7 @@ kdeFramework { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtdeclarative qtscript ]; propagatedNativeBuildInputs = [ gettext python ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 6141db849efe0..6102bb0d4b569 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, ecm +, extra-cmake-modules , karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg }: @@ -7,6 +7,6 @@ kdeFramework { name = "kiconthemes"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index d3f46512db231..758260517e7df 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , qtbase , qtx11extras }: @@ -7,6 +7,6 @@ kdeFramework { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 631cac4217c81..2a8e825893bf3 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,14 +1,14 @@ { kdeFramework, lib, - ecm, - ilmbase, karchive + extra-cmake-modules, + ilmbase, karchive, qtbase }: kdeFramework { name = "kimageformats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; - buildInputs = [ ilmbase ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ ilmbase qtbase ]; propagatedBuildInputs = [ karchive ]; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; } diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 032bdd30d9ec8..b965f761e9225 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -1,13 +1,13 @@ { kdeFramework, lib, copyPathsToStore, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kconfig, kcrash, ki18n, kio, kservice, kwindowsystem }: kdeFramework { name = "kinit"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem ]; diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 7623e44a07613..cb67c84590348 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, ecm, acl, karchive +, extra-cmake-modules, acl, karchive , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet @@ -10,7 +10,7 @@ kdeFramework { name = "kio"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 0a474dfdb7d7d..d6538e57698cc 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -1,9 +1,10 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules, qtbase }: kdeFramework { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 0af3de5770a9c..f114c007038be 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,9 +1,10 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules, qtbase, qttools }: kdeFramework { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 1337f4109c2d7..ddc66d2eb20a0 100644 --- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -1,13 +1,13 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , kcoreaddons , kwidgetsaddons -, qtx11extras +, qttools, qtx11extras }: kdeFramework { name = "kjobwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index 12852e6a1e774..abdc15ce8df61 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -1,10 +1,10 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , kdoctools }: kdeFramework { name = "kjs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix index 20c8b2eea1625..95bc02422f1bf 100644 --- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib, ecm, kdoctools, ki18n, kjs +{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs , qtsvg }: kdeFramework { name = "kjsembed"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ ki18n kjs qtsvg ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index 360d8e90daf2e..93a6b450f762d 100644 --- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , kparts , kxmlgui }: @@ -7,6 +7,6 @@ kdeFramework { name = "kmediaplayer"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kparts kxmlgui ]; } diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix index b6a84e2539d2e..002418c65ad0c 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, attica, karchive +{ kdeFramework, lib, extra-cmake-modules, attica, karchive , kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio , kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui }: @@ -6,7 +6,7 @@ kdeFramework { name = "knewstuff"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 061a5d8d142ae..c1c0795787255 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -1,15 +1,15 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules , kcodecs, kconfig, kcoreaddons, kwindowsystem , libdbusmenu , phonon -, qtx11extras +, qttools, qtx11extras }: kdeFramework { name = "knotifications"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index b64f109f08b1e..0e357aecb999c 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib, ecm, kcompletion, kconfig +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig , ki18n, kio, phonon }: kdeFramework { name = "knotifyconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 86ca5935a75d2..2953aea9a557f 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,13 +1,13 @@ { kdeFramework, fetchurl, lib, copyPathsToStore, - ecm, kdoctools, + extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n }: kdeFramework { name = "kpackage"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix index a46fa210b2764..ad6ea2dbc3059 100644 --- a/pkgs/development/libraries/kde-frameworks/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks/kparts.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kconfig, kcoreaddons +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons , ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice , ktextwidgets, kwidgetsaddons, kxmlgui }: @@ -6,7 +6,7 @@ kdeFramework { name = "kparts"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications kservice ktextwidgets kwidgetsaddons kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix index 4ca9bc7fdbf94..6acb5e2eed513 100644 --- a/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix @@ -1,11 +1,11 @@ -{ kdeFramework, lib, ecm, kcoreaddons, ki18n +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n , kitemviews, kservice, kwidgetsaddons, qtdeclarative }: kdeFramework { name = "kpeople"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative ]; diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 6eda06445dc59..3fa8283d06c4d 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -1,9 +1,10 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules, qtbase }: kdeFramework { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix index d42f96fb92c5a..8bdaacb85f82b 100644 --- a/pkgs/development/libraries/kde-frameworks/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks/kpty.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, ecm, kcoreaddons, ki18n }: +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: kdeFramework { name = "kpty"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcoreaddons ki18n ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix index ae098654eb11b..0e66d95b5cce8 100644 --- a/pkgs/development/libraries/kde-frameworks/kross.nix +++ b/pkgs/development/libraries/kde-frameworks/kross.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kcompletion, kcoreaddons +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons , kxmlgui, qtscript }: @@ -6,7 +6,7 @@ kdeFramework { name = "kross"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui qtscript diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index 064a89e08067d..ec9ab7abe9f91 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kconfig, kcoreaddons +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons , ki18n, kio, kservice, plasma-framework, solid , threadweaver }: @@ -6,7 +6,7 @@ kdeFramework { name = "krunner"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index ca840fc8b71a9..2751a7f5d6e0e 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,13 +1,13 @@ { kdeFramework, lib, copyPathsToStore, - bison, ecm, flex, + bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem }: kdeFramework { name = "kservice"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - propagatedNativeBuildInputs = [ bison ecm flex ]; + propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ]; nativeBuildInputs = [ kdoctools ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 0e444cc8db682..fbd73c65eff67 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, ecm, perl +, extra-cmake-modules, perl , karchive, kconfig, kguiaddons, kiconthemes, kparts , libgit2 , qtscript, qtxmlpatterns @@ -9,7 +9,7 @@ kdeFramework { name = "ktexteditor"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm perl ]; + nativeBuildInputs = [ extra-cmake-modules perl ]; propagatedBuildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript qtxmlpatterns sonnet syntax-highlighting diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 3a1258e9a37b5..25954c603971c 100644 --- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kcompletion, kconfig +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig , kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem , sonnet }: @@ -6,7 +6,7 @@ kdeFramework { name = "ktextwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem sonnet diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index 136587cc682e6..c04ded722aa4a 100644 --- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, ecm, ki18n }: +{ kdeFramework, lib, extra-cmake-modules, ki18n }: kdeFramework { name = "kunitconversion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ ki18n ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index fb801f48b1195..f02c6138df77a 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kconfig, kconfigwidgets +{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt }: @@ -6,7 +6,7 @@ kdeFramework { name = "kwallet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes knotifications kservice kwidgetsaddons kwindowsystem libgcrypt diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index c530bf80a90ef..b5255022a86d2 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,13 +1,14 @@ { kdeFramework -, ecm -, wayland +, extra-cmake-modules +, qtbase, wayland }: kdeFramework { name = "kwayland"; nativeBuildInputs = [ - ecm + extra-cmake-modules ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ wayland ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index ae34e60c4c120..c5c0063c46345 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -1,9 +1,10 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules, qtbase, qttools }: kdeFramework { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix index 64186a30eadc4..e55c4021b9eda 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, ecm -, qtx11extras +, extra-cmake-modules +, qttools, qtx11extras }: kdeFramework { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index c48fc9efdfada..ea800bf58ae0e 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, attica, kconfig +{ kdeFramework, lib, extra-cmake-modules, attica, kconfig , kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews , ktextwidgets, kwindowsystem, sonnet }: @@ -6,7 +6,7 @@ kdeFramework { name = "kxmlgui"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem sonnet diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index 31301875351fe..f20f4a2239458 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, ecm, ki18n, kio }: +{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: kdeFramework { name = "kxmlrpcclient"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ ki18n kio ]; } diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index bf3487dcb391b..b4d05678dc2f7 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -1,11 +1,12 @@ { kdeFramework, lib -, ecm -, modemmanager +, extra-cmake-modules +, modemmanager, qtbase }: kdeFramework { name = "modemmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ modemmanager ]; } diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index bb59686353885..9d765eac95cc2 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -1,11 +1,12 @@ { kdeFramework, lib -, ecm -, networkmanager +, extra-cmake-modules +, qtbase, networkmanager }: kdeFramework { name = "networkmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ networkmanager ]; } diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 42978b46992d4..1d45b51274c54 100644 --- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix @@ -1,6 +1,6 @@ { kdeFramework , lib -, ecm +, extra-cmake-modules, qtbase }: kdeFramework { @@ -10,5 +10,6 @@ kdeFramework { maintainers = [ lib.maintainers.ttuegel ]; }; outputs = [ "out" ]; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 963e932272799..2fd667af0dc13 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, fetchurl, ecm, kactivities, karchive +{ kdeFramework, lib, fetchurl, extra-cmake-modules, kactivities, karchive , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui @@ -8,7 +8,7 @@ kdeFramework { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index de10a7345581b..330b64035a12b 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,12 +1,12 @@ { kdeFramework, lib, - bison, ecm, flex, - qtdeclarative + bison, extra-cmake-modules, flex, + qtdeclarative, qttools }: kdeFramework { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ bison ecm flex ]; + nativeBuildInputs = [ bison extra-cmake-modules flex qttools ]; propagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 8b1cf6a2cd11d..190f2bae1b825 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, ecm -, hunspell +, extra-cmake-modules +, hunspell, qtbase, qttools }: kdeFramework { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; - buildInputs = [ hunspell ]; + nativeBuildInputs = [ extra-cmake-modules qttools ]; + buildInputs = [ hunspell qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index 24b1bbc4f6742..155e9fb8961bb 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -1,9 +1,10 @@ { kdeFramework, lib -, ecm, perl +, extra-cmake-modules, perl, qtbase, qttools }: kdeFramework { name = "syntax-highlighting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm perl ]; + nativeBuildInputs = [ extra-cmake-modules perl qttools ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index 6d3dff6041321..bf36a21e9ec6c 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -1,9 +1,10 @@ { kdeFramework, lib -, ecm +, extra-cmake-modules, qtbase }: kdeFramework { name = "threadweaver"; - nativeBuildInputs = [ ecm ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; } |