diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix index 0408f69a94a..3c5e2f570d7 100644 --- a/pkgs/desktops/plasma-5.4/bluedevil.nix +++ b/pkgs/desktops/plasma-5.4/bluedevil.nix @@ -1,12 +1,14 @@ { plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons , kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative -, shared_mime_info +, kwidgetsaddons, kwindowsystem, makeKDEWrapper, plasma-framework +, qtdeclarative, shared_mime_info }: plasmaPackage { name = "bluedevil"; - nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + nativeBuildInputs = [ + extra-cmake-modules makeKDEWrapper shared_mime_info + ]; buildInputs = [ kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index 6e878b42858..9583a0084c2 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, frameworkintegration , kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons -, ki18n, kwindowsystem, qtx11extras +, ki18n, kwindowsystem, makeKDEWrapper, qtx11extras }: plasmaPackage { @@ -8,6 +8,7 @@ plasmaPackage { sname = "breeze"; nativeBuildInputs = [ extra-cmake-modules + makeKDEWrapper ]; buildInputs = [ kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix index 56676a9c52e..0b0e7b32424 100644 --- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix @@ -1,11 +1,11 @@ { plasmaPackage, extra-cmake-modules, kcmutils, kconfig , kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes -, kwindowsystem, qtsvg, qtx11extras +, kwindowsystem, makeKDEWrapper, qtsvg, qtx11extras }: plasmaPackage { name = "kde-cli-tools"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ kcmutils kconfig kdesu kiconthemes ]; diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix index 609996c3bd1..5759605af2b 100644 --- a/pkgs/desktops/plasma-5.4/khelpcenter.nix +++ b/pkgs/desktops/plasma-5.4/khelpcenter.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kconfig , kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support -, khtml, kservice +, khtml, kservice, makeKDEWrapper }: plasmaPackage { @@ -8,6 +8,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kinit kcmutils kservice diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix index 4015507aa2f..80caa95dc88 100644 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -1,7 +1,8 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kcmutils , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons , kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage -, kservice, kwidgetsaddons, kxmlgui, libraw1394, pciutils, solid +, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeKDEWrapper +, pciutils, solid }: plasmaPackage { @@ -9,6 +10,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix index 673a56c9513..d8c9c3aa2ac 100644 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -1,5 +1,5 @@ { plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui -, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support +, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeKDEWrapper }: plasmaPackage { @@ -7,6 +7,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kxmlgui kdbusaddons kiconthemes diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index f2f34807365..c97bc4e1871 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -1,12 +1,13 @@ { plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui -, libkscreen, qtdeclarative +, libkscreen, makeKDEWrapper, qtdeclarative }: plasmaPackage { name = "kscreen"; nativeBuildInputs = [ extra-cmake-modules + makeKDEWrapper ]; buildInputs = [ kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix index 0a68893e0bf..112d8eda403 100644 --- a/pkgs/desktops/plasma-5.4/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5.4/ksshaskpass.nix @@ -1,10 +1,10 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons -, ki18n, kwallet, kwidgetsaddons +, ki18n, kwallet, kwidgetsaddons, makeKDEWrapper }: plasmaPackage { name = "ksshaskpass"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ kcoreaddons kwallet kwidgetsaddons ]; propagatedBuildInputs = [ ki18n ]; postInstall = '' diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix index 5f24d68bb39..4e9fca43ded 100644 --- a/pkgs/desktops/plasma-5.4/ksysguard.nix +++ b/pkgs/desktops/plasma-5.4/ksysguard.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kconfig , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard +, kiconthemes, libksysguard, makeKDEWrapper }: plasmaPackage { @@ -8,6 +8,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index da2a6cab4b0..58ccd4809c7 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -1,12 +1,12 @@ { plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig , kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion -, frameworkintegration, kwindowsystem, qtx11extras +, frameworkintegration, kwindowsystem, makeKDEWrapper, qtx11extras }: plasmaPackage { name = "oxygen"; nativeBuildInputs = [ - extra-cmake-modules + extra-cmake-modules makeKDEWrapper ]; buildInputs = [ kcmutils kconfig kdecoration kguiaddons kwidgetsaddons diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index c2fc9851730..f0271e87687 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -6,7 +6,7 @@ , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver -, libcanberra_kde, libpulseaudio, utillinux +, libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux }: plasmaPackage { @@ -14,6 +14,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index 9f956ca635e..7b0a65473d1 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -2,9 +2,9 @@ , kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem -, kxmlgui, mobile_broadband_provider_info, modemmanager-qt -, networkmanager-qt, openconnect, plasma-framework, qtdeclarative -, solid +, kxmlgui, makeKDEWrapper, mobile_broadband_provider_info +, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework +, qtdeclarative, solid }: plasmaPackage { @@ -12,6 +12,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix index 5e29fe2e2e6..6ccce9dec0e 100644 --- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix @@ -6,8 +6,8 @@ , libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt , pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland , libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig -, kinit, kservice, qttools, dbus_tools, mkfontdir, xmessage, xprop -, xrdb, xset, xsetroot, solid +, kinit, kservice, makeKDEWrapper, qttools, dbus_tools, mkfontdir, xmessage +, xprop, xrdb, xset, xsetroot, solid }: plasmaPackage { @@ -15,6 +15,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index e5617e1e5df..7cf656e9dbe 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -1,6 +1,6 @@ { plasmaPackage, extra-cmake-modules, kdoctools, kitemviews , kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem -, kxmlgui, kdbusaddons, kconfig, khtml +, kxmlgui, kdbusaddons, kconfig, khtml, makeKDEWrapper }: plasmaPackage { @@ -8,6 +8,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools + makeKDEWrapper ]; buildInputs = [ kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons diff --git a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix index adfe7894f8d..a11c316010d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/baloo.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, kauth, kconfig , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime -, kio, lmdb, qtbase, qtquick1, solid +, kio, lmdb, makeKDEWrapper, qtbase, qtquick1, solid }: kdeFramework { name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; buildInputs = [ kconfig kcrash kdbusaddons lmdb qtquick1 solid ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/default.nix index 1ff433c13c8..0fc3d77c67b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/default.nix @@ -9,7 +9,7 @@ let - inherit (pkgs) lib stdenv; + inherit (pkgs) lib makeSetupHook stdenv; mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; @@ -105,6 +105,7 @@ let solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; threadweaver = callPackage ./threadweaver.nix {}; + makeKDEWrapper = callPackage ./make-kde-wrapper.nix { inherit makeSetupHook; }; }; newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope); diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix index 4d669b72a89..3c5b4155fa4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/default.nix @@ -2,7 +2,6 @@ kdeFramework { name = "extra-cmake-modules"; - setupHook = ./setup-hook.sh; patches = [ ./0001-extra-cmake-modules-paths.patch ]; # It is OK to propagate these inputs as long as diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix index 3cdc3c4144d..955a6120e2c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kactivities.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n -, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative +, kio, kservice, kwindowsystem, kxmlgui, makeKDEWrapper, qtdeclarative }: kdeFramework { name = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; buildInputs = [ boost kcmutils kconfig kcoreaddons kdbusaddons kservice kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix index ce890745767..8d076e03fa9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix @@ -1,10 +1,11 @@ { kdeFramework, lib , extra-cmake-modules +, makeKDEWrapper }: kdeFramework { name = "kconfig"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; postInstall = '' wrapKDEProgram "$out/bin/kreadconfig5" wrapKDEProgram "$out/bin/kwriteconfig5" diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix index 39315d9616b..2112f2274f9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix @@ -1,10 +1,10 @@ { kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig -, kdoctools, kguiaddons, ki18n, kwidgetsaddons +, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeKDEWrapper }: kdeFramework { name = "kconfigwidgets"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ kguiaddons ]; propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix index ed046e58262..4a1c7a19842 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix @@ -1,11 +1,12 @@ { kdeFramework, lib , extra-cmake-modules +, makeKDEWrapper , qtx11extras }: kdeFramework { name = "kdbusaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; propagatedBuildInputs = [ qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kquitapp5" diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix index aaeb97a067b..32df2fc3f8a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix @@ -1,11 +1,12 @@ { kdeFramework, lib, extra-cmake-modules, epoxy, kconfig , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage -, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative +, kwidgetsaddons, kwindowsystem, makeKDEWrapper, pkgconfig +, qtdeclarative }: kdeFramework { name = "kdeclarative"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; buildInputs = [ epoxy kguiaddons kiconthemes kwidgetsaddons ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix index 0eeaf89c58b..bc17a391afd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kdoctools/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 -, docbook5_xsl, karchive, ki18n, perl, perlPackages +, docbook5_xsl, karchive, ki18n, makeKDEWrapper, perl, perlPackages }: kdeFramework { @@ -7,7 +7,7 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive ]; propagatedBuildInputs = [ ki18n ]; - propagatedNativeBuildInputs = [ perl perlPackages.URI ]; + propagatedNativeBuildInputs = [ makeKDEWrapper perl perlPackages.URI ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix index 32f71a7e3dc..12094ad7f79 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix @@ -5,12 +5,13 @@ , kcrash , kdbusaddons , kwindowsystem +, makeKDEWrapper , qtx11extras }: kdeFramework { name = "kglobalaccel"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; propagatedBuildInputs = [ kwindowsystem qtx11extras ]; postInstall = '' diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix index 58d5667a50e..c125157f623 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kio.nix @@ -2,13 +2,13 @@ , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui, qtscript, qtx11extras -, solid +, kwidgetsaddons, kwindowsystem, kxmlgui, makeKDEWrapper +, qtscript, qtx11extras, solid }: kdeFramework { name = "kio"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ acl karchive kconfig kcoreaddons kdbusaddons kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix index 902674d49b7..cdbc20f279d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjs.nix @@ -1,11 +1,12 @@ { kdeFramework, lib , extra-cmake-modules , kdoctools +, makeKDEWrapper }: kdeFramework { name = "kjs"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; postInstall = '' wrapKDEProgram "$out/bin/kjs5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix index 6997e48d07b..e6d08d387b6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix @@ -1,10 +1,10 @@ { kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs -, qtsvg +, makeKDEWrapper, qtsvg }: kdeFramework { name = "kjsembed"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ qtsvg ]; propagatedBuildInputs = [ ki18n kjs ]; postInstall = '' diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix index 4e4c2412ced..3581eb3deca 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix @@ -5,11 +5,12 @@ , kcoreaddons , kdoctools , ki18n +, makeKDEWrapper }: kdeFramework { name = "kpackage"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ karchive kconfig ]; propagatedBuildInputs = [ kcoreaddons ki18n ]; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix index 77f1c5d05e6..4267b65281f 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix @@ -1,11 +1,11 @@ { kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications -, kservice, kwidgetsaddons, kwindowsystem, libgcrypt +, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeKDEWrapper }: kdeFramework { name = "kwallet"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kiconthemes knotifications kservice kwidgetsaddons libgcrypt diff --git a/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix new file mode 100644 index 00000000000..2df5037bb33 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix @@ -0,0 +1,3 @@ +{ makeSetupHook, makeQtWrapper }: + +makeSetupHook { deps = [ makeQtWrapper ]; } ./make-kde-wrapper.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.15/extra-cmake-modules/setup-hook.sh rename to pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix index a47b904d25d..97cbfee36e5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/plasma-framework/default.nix @@ -2,12 +2,12 @@ , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwindowsystem, kxmlgui -, qtscript, qtx11extras +, makeKDEWrapper, qtscript, qtx11extras }: kdeFramework { name = "plasma-framework"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kiconthemes knotifications kxmlgui qtscript diff --git a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix index 06b0797cbc1..ce2af0f6a5d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.15/solid.nix +++ b/pkgs/development/libraries/kde-frameworks-5.15/solid.nix @@ -1,10 +1,11 @@ { kdeFramework, lib , extra-cmake-modules +, makeKDEWrapper }: kdeFramework { name = "solid"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ]; postInstall = '' wrapKDEProgram "$out/bin/solid-hardware5" '';