remove kf515.makeKDEWrapper

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, makeKDEWrapper, qtbase, qtquick1, solid
+, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
 }:
 
 kdeFramework {
   name = "baloo";
-  nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
   buildInputs = [
     kconfig kcrash kdbusaddons lmdb qtquick1 solid
   ];
@@ -13,11 +13,11 @@ kdeFramework {
     kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/baloo_file"
-    wrapKDEProgram "$out/bin/baloo_file_extractor"
-    wrapKDEProgram "$out/bin/balooctl"
-    wrapKDEProgram "$out/bin/baloosearch"
-    wrapKDEProgram "$out/bin/balooshow"
+    wrapQtProgram "$out/bin/baloo_file"
+    wrapQtProgram "$out/bin/baloo_file_extractor"
+    wrapQtProgram "$out/bin/balooctl"
+    wrapQtProgram "$out/bin/baloosearch"
+    wrapQtProgram "$out/bin/balooshow"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/default.nix

@@ -105,7 +105,6 @@ 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);

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, makeKDEWrapper, qtdeclarative
+, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
 }:
 
 kdeFramework {
   name = "kactivities";
-  nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
   buildInputs = [
     boost kcmutils kconfig kcoreaddons kdbusaddons kservice
     kxmlgui
@@ -14,7 +14,7 @@ kdeFramework {
     kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kactivitymanagerd"
+    wrapQtProgram "$out/bin/kactivitymanagerd"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/kconfig.nix

@@ -1,14 +1,14 @@
 { kdeFramework, lib
 , extra-cmake-modules
-, makeKDEWrapper
+, makeQtWrapper
 }:
 
 kdeFramework {
   name = "kconfig";
-  nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kreadconfig5"
-    wrapKDEProgram "$out/bin/kwriteconfig5"
+    wrapQtProgram "$out/bin/kreadconfig5"
+    wrapQtProgram "$out/bin/kwriteconfig5"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/kconfigwidgets/default.nix

@@ -1,15 +1,15 @@
 { kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
-, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeKDEWrapper
+, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
 }:
 
 kdeFramework {
   name = "kconfigwidgets";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [ kguiaddons ];
   propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/preparetips5"
+    wrapQtProgram "$out/bin/preparetips5"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/kdbusaddons.nix

@@ -1,15 +1,15 @@
 { kdeFramework, lib
 , extra-cmake-modules
-, makeKDEWrapper
+, makeQtWrapper
 , qtx11extras
 }:
 
 kdeFramework {
   name = "kdbusaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
   propagatedBuildInputs = [ qtx11extras ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kquitapp5"
+    wrapQtProgram "$out/bin/kquitapp5"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/kdeclarative.nix

@@ -1,12 +1,12 @@
 { kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
 , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
-, kwidgetsaddons, kwindowsystem, makeKDEWrapper, pkgconfig
+, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
 , qtdeclarative
 }:
 
 kdeFramework {
   name = "kdeclarative";
-  nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
   buildInputs = [
     epoxy kguiaddons kiconthemes kwidgetsaddons
   ];
@@ -14,7 +14,7 @@ kdeFramework {
     kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kpackagelauncherqml"
+    wrapQtProgram "$out/bin/kpackagelauncherqml"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

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, makeKDEWrapper, perl, perlPackages
+, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
 }:
 
 kdeFramework {
@@ -7,7 +7,7 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ karchive ];
   propagatedBuildInputs = [ ki18n ];
-  propagatedNativeBuildInputs = [ makeKDEWrapper perl perlPackages.URI ];
+  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"

pkgs/development/libraries/kde-frameworks-5.15/kglobalaccel.nix

@@ -5,17 +5,17 @@
 , kcrash
 , kdbusaddons
 , kwindowsystem
-, makeKDEWrapper
+, makeQtWrapper
 , qtx11extras
 }:
 
 kdeFramework {
   name = "kglobalaccel";
-  nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
   buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
   propagatedBuildInputs = [ kwindowsystem qtx11extras ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kglobalaccel5"
+    wrapQtProgram "$out/bin/kglobalaccel5"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

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, makeKDEWrapper
+, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
 , qtscript, qtx11extras, solid
 }:
 
 kdeFramework {
   name = "kio";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
     acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
     knotifications ktextwidgets kwallet kwidgetsaddons
@@ -19,10 +19,10 @@ kdeFramework {
     kservice kwindowsystem kxmlgui solid qtx11extras
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kcookiejar5"
-    wrapKDEProgram "$out/bin/ktelnetservice5"
-    wrapKDEProgram "$out/bin/ktrash5"
-    wrapKDEProgram "$out/bin/kmailservice5"
+    wrapQtProgram "$out/bin/kcookiejar5"
+    wrapQtProgram "$out/bin/ktelnetservice5"
+    wrapQtProgram "$out/bin/ktrash5"
+    wrapQtProgram "$out/bin/kmailservice5"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/kjs.nix

@@ -1,14 +1,14 @@
 { kdeFramework, lib
 , extra-cmake-modules
 , kdoctools
-, makeKDEWrapper
+, makeQtWrapper
 }:
 
 kdeFramework {
   name = "kjs";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kjs5"
+    wrapQtProgram "$out/bin/kjs5"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/kjsembed.nix

@@ -1,15 +1,15 @@
 { kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, makeKDEWrapper, qtsvg
+, makeQtWrapper, qtsvg
 }:
 
 kdeFramework {
   name = "kjsembed";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [ qtsvg ];
   propagatedBuildInputs = [ ki18n kjs ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kjscmd5"
-    wrapKDEProgram "$out/bin/kjsconsole"
+    wrapQtProgram "$out/bin/kjscmd5"
+    wrapQtProgram "$out/bin/kjsconsole"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/kpackage/default.nix

@@ -5,12 +5,12 @@
 , kcoreaddons
 , kdoctools
 , ki18n
-, makeKDEWrapper
+, makeQtWrapper
 }:
 
 kdeFramework {
   name = "kpackage";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [ karchive kconfig ];
   propagatedBuildInputs = [ kcoreaddons ki18n ];
   patches = [
@@ -18,7 +18,7 @@ kdeFramework {
     ./0002-qdiriterator-follow-symlinks.patch
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kpackagetool5"
+    wrapQtProgram "$out/bin/kpackagetool5"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/kwallet.nix

@@ -1,19 +1,19 @@
 { kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
 , kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
-, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeKDEWrapper
+, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
 }:
 
 kdeFramework {
   name = "kwallet";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
     kconfig kcoreaddons kdbusaddons kiconthemes knotifications
     kservice kwidgetsaddons libgcrypt
   ];
   propagatedBuildInputs = [ ki18n kwindowsystem ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kwalletd5"
-    wrapKDEProgram "$out/bin/kwallet-query"
+    wrapQtProgram "$out/bin/kwalletd5"
+    wrapQtProgram "$out/bin/kwallet-query"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.nix

@@ -1,3 +0,0 @@
-{ makeSetupHook, makeQtWrapper }:
-
-makeSetupHook { deps = [ makeQtWrapper ]; } ./make-kde-wrapper.sh

pkgs/development/libraries/kde-frameworks-5.15/make-kde-wrapper.sh

@@ -1,13 +0,0 @@
-makeKDEWrapper() {
-    local old="$1"
-    local new="$2"
-    shift
-    shift
-    makeQtWrapper "$old" "$new" "$@"
-}
-
-wrapKDEProgram() {
-    local prog="$1"
-    shift
-    wrapQtProgram "$prog" "$@"
-}

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
-, makeKDEWrapper, qtscript, qtx11extras
+, makeQtWrapper, qtscript, qtx11extras
 }:
 
 kdeFramework {
   name = "plasma-framework";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
     karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
     kiconthemes knotifications kxmlgui qtscript
@@ -17,7 +17,7 @@ kdeFramework {
     qtx11extras
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/plasmapkg2"
+    wrapQtProgram "$out/bin/plasmapkg2"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.15/solid.nix

@@ -1,15 +1,15 @@
 { kdeFramework, lib
 , extra-cmake-modules
-, makeKDEWrapper
+, makeQtWrapper
 , qtdeclarative
 }:
 
 kdeFramework {
   name = "solid";
-  nativeBuildInputs = [ extra-cmake-modules makeKDEWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
   buildInputs = [ qtdeclarative ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/solid-hardware5"
+    wrapQtProgram "$out/bin/solid-hardware5"
   '';
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];