summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-10-18 09:24:59 -0500
committerThomas Tuegel <ttuegel@gmail.com>2015-10-30 16:10:37 -0500
commit5292e67e50811e9ccf800708f3b18290c9098a39 (patch)
tree0f070a0dad717bfbf5ca1c65f603c07629cb8edc /pkgs/desktops
parentfa81cf08741a4ba4188ee103ac8cbb98ee29c391 (diff)
downloadnixlib-5292e67e50811e9ccf800708f3b18290c9098a39.tar
nixlib-5292e67e50811e9ccf800708f3b18290c9098a39.tar.gz
nixlib-5292e67e50811e9ccf800708f3b18290c9098a39.tar.bz2
nixlib-5292e67e50811e9ccf800708f3b18290c9098a39.tar.lz
nixlib-5292e67e50811e9ccf800708f3b18290c9098a39.tar.xz
nixlib-5292e67e50811e9ccf800708f3b18290c9098a39.tar.zst
nixlib-5292e67e50811e9ccf800708f3b18290c9098a39.zip
remove kf515.makeKDEWrapper
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/plasma-5.4/bluedevil.nix8
-rw-r--r--pkgs/desktops/plasma-5.4/breeze-qt5.nix8
-rw-r--r--pkgs/desktops/plasma-5.4/kde-cli-tools.nix24
-rw-r--r--pkgs/desktops/plasma-5.4/khelpcenter.nix6
-rw-r--r--pkgs/desktops/plasma-5.4/kinfocenter.nix6
-rw-r--r--pkgs/desktops/plasma-5.4/kmenuedit.nix6
-rw-r--r--pkgs/desktops/plasma-5.4/kscreen.nix6
-rw-r--r--pkgs/desktops/plasma-5.4/ksshaskpass.nix6
-rw-r--r--pkgs/desktops/plasma-5.4/ksysguard.nix8
-rw-r--r--pkgs/desktops/plasma-5.4/kwin/default.nix7
-rw-r--r--pkgs/desktops/plasma-5.4/oxygen.nix8
-rw-r--r--pkgs/desktops/plasma-5.4/plasma-desktop/default.nix20
-rw-r--r--pkgs/desktops/plasma-5.4/plasma-nm.nix6
-rw-r--r--pkgs/desktops/plasma-5.4/plasma-workspace/default.nix31
-rw-r--r--pkgs/desktops/plasma-5.4/systemsettings.nix6
15 files changed, 78 insertions, 78 deletions
diff --git a/pkgs/desktops/plasma-5.4/bluedevil.nix b/pkgs/desktops/plasma-5.4/bluedevil.nix
index 3c5e2f570d74..d099e95a16b4 100644
--- a/pkgs/desktops/plasma-5.4/bluedevil.nix
+++ b/pkgs/desktops/plasma-5.4/bluedevil.nix
@@ -1,13 +1,13 @@
 { plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons
 , kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications
-, kwidgetsaddons, kwindowsystem, makeKDEWrapper, plasma-framework
+, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework
 , qtdeclarative, shared_mime_info
 }:
 
 plasmaPackage {
   name = "bluedevil";
   nativeBuildInputs = [
-    extra-cmake-modules makeKDEWrapper shared_mime_info
+    extra-cmake-modules makeQtWrapper shared_mime_info
   ];
   buildInputs = [
     kcoreaddons kdbusaddons kded kiconthemes knotifications
@@ -17,7 +17,7 @@ plasmaPackage {
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/bluedevil-wizard"
-    wrapKDEProgram "$out/bin/bluedevil-sendfile"
+    wrapQtProgram "$out/bin/bluedevil-wizard"
+    wrapQtProgram "$out/bin/bluedevil-sendfile"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix
index 9583a0084c27..f50179ef64ce 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, makeKDEWrapper, qtx11extras
+, ki18n, kwindowsystem, makeQtWrapper, qtx11extras
 }:
 
 plasmaPackage {
@@ -8,14 +8,14 @@ plasmaPackage {
   sname = "breeze";
   nativeBuildInputs = [
     extra-cmake-modules
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
   ];
   propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
-  cmakeFlags = [ "-DUSE_KDE4=OFF" ];
+  cmakeFlags = [ "-DUSE_Qt4=OFF" ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/breeze-settings5"
+    wrapQtProgram "$out/bin/breeze-settings5"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix
index 0b0e7b324249..7f19af6959ec 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, makeKDEWrapper, qtsvg, qtx11extras
+, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras
 }:
 
 plasmaPackage {
   name = "kde-cli-tools";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
     kcmutils kconfig kdesu kiconthemes
   ];
@@ -13,15 +13,15 @@ plasmaPackage {
     kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kmimetypefinder5"
-    wrapKDEProgram "$out/bin/ksvgtopng5"
-    wrapKDEProgram "$out/bin/ktraderclient5"
-    wrapKDEProgram "$out/bin/kioclient5"
-    wrapKDEProgram "$out/bin/kdecp5"
-    wrapKDEProgram "$out/bin/keditfiletype5"
-    wrapKDEProgram "$out/bin/kcmshell5"
-    wrapKDEProgram "$out/bin/kdemv5"
-    wrapKDEProgram "$out/bin/kstart5"
-    wrapKDEProgram "$out/bin/kde-open5"
+    wrapQtProgram "$out/bin/kmimetypefinder5"
+    wrapQtProgram "$out/bin/ksvgtopng5"
+    wrapQtProgram "$out/bin/ktraderclient5"
+    wrapQtProgram "$out/bin/kioclient5"
+    wrapQtProgram "$out/bin/kdecp5"
+    wrapQtProgram "$out/bin/keditfiletype5"
+    wrapQtProgram "$out/bin/kcmshell5"
+    wrapQtProgram "$out/bin/kdemv5"
+    wrapQtProgram "$out/bin/kstart5"
+    wrapQtProgram "$out/bin/kde-open5"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix
index 5759605af2b7..6ba860b9dfb2 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, makeKDEWrapper
+, khtml, kservice, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -8,13 +8,13 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
   ];
   propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/khelpcenter"
+    wrapQtProgram "$out/bin/khelpcenter"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix
index 80caa95dc886..ed717790cd0d 100644
--- a/pkgs/desktops/plasma-5.4/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix
@@ -1,7 +1,7 @@
 { plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
 , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
 , kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
-, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeKDEWrapper
+, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper
 , pciutils, solid
 }:
 
@@ -10,7 +10,7 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
@@ -19,6 +19,6 @@ plasmaPackage {
   ];
   propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kinfocenter"
+    wrapQtProgram "$out/bin/kinfocenter"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix
index d8c9c3aa2ac0..3834ca1328f8 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, makeKDEWrapper
+, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -7,13 +7,13 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kxmlgui kdbusaddons kiconthemes
   ];
   propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kmenuedit"
+    wrapQtProgram "$out/bin/kmenuedit"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix
index c97bc4e18710..64fcab343e44 100644
--- a/pkgs/desktops/plasma-5.4/kscreen.nix
+++ b/pkgs/desktops/plasma-5.4/kscreen.nix
@@ -1,19 +1,19 @@
 { plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
 , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
-, libkscreen, makeKDEWrapper, qtdeclarative
+, libkscreen, makeQtWrapper, qtdeclarative
 }:
 
 plasmaPackage {
   name = "kscreen";
   nativeBuildInputs = [
     extra-cmake-modules
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
   ];
   propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kscreen-console"
+    wrapQtProgram "$out/bin/kscreen-console"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix
index 112d8eda4036..f274512e027a 100644
--- a/pkgs/desktops/plasma-5.4/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5.4/ksshaskpass.nix
@@ -1,13 +1,13 @@
 { plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
-, ki18n, kwallet, kwidgetsaddons, makeKDEWrapper
+, ki18n, kwallet, kwidgetsaddons, makeQtWrapper
 }:
 
 plasmaPackage {
   name = "ksshaskpass";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
   propagatedBuildInputs = [ ki18n ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/ksshaskpass"
+    wrapQtProgram "$out/bin/ksshaskpass"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix
index 4e9fca43ded8..7af3584989c3 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, makeKDEWrapper
+, kiconthemes, libksysguard, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -8,14 +8,14 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
   ];
   propagatedBuildInputs = [ kdelibs4support ki18n ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/ksysguardd"
-    wrapKDEProgram "$out/bin/ksysguard"
+    wrapQtProgram "$out/bin/ksysguardd"
+    wrapQtProgram "$out/bin/ksysguard"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix
index 6afdf33e1bba..89da25f691d8 100644
--- a/pkgs/desktops/plasma-5.4/kwin/default.nix
+++ b/pkgs/desktops/plasma-5.4/kwin/default.nix
@@ -4,7 +4,7 @@
 , ki18n, kiconthemes, kinit, kio, knewstuff, knotifications
 , kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem
 , kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
-, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
+, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -12,6 +12,7 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
     epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
@@ -25,7 +26,7 @@ plasmaPackage {
   ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kwin_x11"
-    wrapKDEProgram "$out/bin/kwin_wayland"
+    wrapQtProgram "$out/bin/kwin_x11"
+    wrapQtProgram "$out/bin/kwin_wayland"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix
index 58ccd4809c79..02918100408a 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, makeKDEWrapper, qtx11extras
+, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
 }:
 
 plasmaPackage {
   name = "oxygen";
   nativeBuildInputs = [
-    extra-cmake-modules makeKDEWrapper
+    extra-cmake-modules makeQtWrapper
   ];
   buildInputs = [
     kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
@@ -14,7 +14,7 @@ plasmaPackage {
   ];
   propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/oxygen-demo5"
-    wrapKDEProgram "$out/bin/oxygen-settings5"
+    wrapQtProgram "$out/bin/oxygen-demo5"
+    wrapQtProgram "$out/bin/oxygen-settings5"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
index eb013292805a..51b67b343f27 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, makeKDEWrapper, utillinux
+, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
 }:
 
 plasmaPackage rec {
@@ -14,7 +14,7 @@ plasmaPackage rec {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     attica boost fontconfig kcmutils kdbusaddons kded kitemmodels
@@ -52,13 +52,13 @@ plasmaPackage rec {
 
     cd "$NIX_BUILD_TOP"
 
-    wrapKDEProgram "$out/bin/kaccess"
-    wrapKDEProgram "$out/bin/solid-action-desktop-gen"
-    wrapKDEProgram "$out/bin/knetattach"
-    wrapKDEProgram "$out/bin/krdb"
-    wrapKDEProgram "$out/bin/kapplymousetheme"
-    wrapKDEProgram "$out/bin/kfontinst"
-    wrapKDEProgram "$out/bin/kcm-touchpad-list-devices"
-    wrapKDEProgram "$out/bin/kfontview"
+    wrapQtProgram "$out/bin/kaccess"
+    wrapQtProgram "$out/bin/solid-action-desktop-gen"
+    wrapQtProgram "$out/bin/knetattach"
+    wrapQtProgram "$out/bin/krdb"
+    wrapQtProgram "$out/bin/kapplymousetheme"
+    wrapQtProgram "$out/bin/kfontinst"
+    wrapQtProgram "$out/bin/kcm-touchpad-list-devices"
+    wrapQtProgram "$out/bin/kfontview"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix
index 7b0a65473d15..92b04e2af1fd 100644
--- a/pkgs/desktops/plasma-5.4/plasma-nm.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix
@@ -2,7 +2,7 @@
 , kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
 , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
-, kxmlgui, makeKDEWrapper, mobile_broadband_provider_info
+, kxmlgui, makeQtWrapper, mobile_broadband_provider_info
 , modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
 , qtdeclarative, solid
 }:
@@ -12,7 +12,7 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
@@ -25,6 +25,6 @@ plasmaPackage {
     qtdeclarative
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
+    wrapQtProgram "$out/bin/kde5-nm-connection-editor"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
index 37f55204ec1c..8fa5709feab5 100644
--- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
@@ -6,7 +6,7 @@
 , libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt
 , pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland
 , libksysguard, bash, coreutils, gnused, gnugrep, socat, kconfig
-, kinit, kservice, makeKDEWrapper, qttools, dbus_tools, mkfontdir, xmessage
+, kinit, kservice, makeQtWrapper, qttools, dbus_tools, mkfontdir, xmessage
 , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols
 }:
 
@@ -15,7 +15,7 @@ plasmaPackage rec {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff
@@ -43,19 +43,18 @@ plasmaPackage rec {
   '';
   postInstall = ''
     export QT_WRAPPER_IMPURE=1
-    export KDE_WRAPPER_IMPURE=1
-    wrapKDEProgram "$out/bin/ksmserver"
-    wrapKDEProgram "$out/bin/plasmawindowed"
-    wrapKDEProgram "$out/bin/kcminit_startup"
-    wrapKDEProgram "$out/bin/ksplashqml"
-    wrapKDEProgram "$out/bin/kcheckrunning"
-    wrapKDEProgram "$out/bin/systemmonitor"
-    wrapKDEProgram "$out/bin/kstartupconfig5"
-    wrapKDEProgram "$out/bin/startplasmacompositor"
-    wrapKDEProgram "$out/bin/kdostartupconfig5"
-    wrapKDEProgram "$out/bin/klipper"
-    wrapKDEProgram "$out/bin/kuiserver5"
-    wrapKDEProgram "$out/bin/krunner"
-    wrapKDEProgram "$out/bin/plasmashell"
+    wrapQtProgram "$out/bin/ksmserver"
+    wrapQtProgram "$out/bin/plasmawindowed"
+    wrapQtProgram "$out/bin/kcminit_startup"
+    wrapQtProgram "$out/bin/ksplashqml"
+    wrapQtProgram "$out/bin/kcheckrunning"
+    wrapQtProgram "$out/bin/systemmonitor"
+    wrapQtProgram "$out/bin/kstartupconfig5"
+    wrapQtProgram "$out/bin/startplasmacompositor"
+    wrapQtProgram "$out/bin/kdostartupconfig5"
+    wrapQtProgram "$out/bin/klipper"
+    wrapQtProgram "$out/bin/kuiserver5"
+    wrapQtProgram "$out/bin/krunner"
+    wrapQtProgram "$out/bin/plasmashell"
   '';
 }
diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix
index 7cf656e9dbeb..a921e153dbc2 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, makeKDEWrapper
+, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -8,7 +8,7 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    makeKDEWrapper
+    makeQtWrapper
   ];
   buildInputs = [
     kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
@@ -16,6 +16,6 @@ plasmaPackage {
   ];
   propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/systemsettings5"
+    wrapQtProgram "$out/bin/systemsettings5"
   '';
 }