Remove kdeWrapper

nixos/modules/services/x11/desktop-managers/plasma5.nix

@@ -7,7 +7,7 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.plasma5;
 
-  inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg;
+  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
 
 in
 
@@ -30,24 +30,12 @@ in
         '';
       };
 
-      extraPackages = mkOption {
-        type = types.listOf types.package;
-        default = [];
-        description = ''
-          KDE packages that need to be installed system-wide.
-        '';
-      };
-
     };
 
   };
 
 
   config = mkMerge [
-    (mkIf (cfg.extraPackages != []) {
-      environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ];
-    })
-
     (mkIf (xcfg.enable && cfg.enable) {
       services.xserver.desktopManager.session = singleton {
         name = "plasma5";
@@ -139,10 +127,14 @@ in
           plasma-workspace
           plasma-workspace-wallpapers
 
+          dolphin
           dolphin-plugins
           ffmpegthumbs
           kdegraphics-thumbnailers
+          khelpcenter
           kio-extras
+          konsole
+          oxygen
           print-manager
 
           breeze-icons
@@ -163,16 +155,6 @@ in
         ++ lib.optional config.services.colord.enable colord-kde
         ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
 
-      services.xserver.desktopManager.plasma5.extraPackages =
-        with kdeApplications; with plasma5;
-        [
-          khelpcenter
-          oxygen
-
-          dolphin
-          konsole
-        ];
-
       environment.pathsToLink = [ "/share" ];
 
       environment.etc = singleton {

pkgs/applications/editors/kdevelop5/kdevelop.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, wrapGAppsHook
 , qtquickcontrols, qtwebkit, qttools, kde-cli-tools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
@@ -12,7 +12,7 @@ let
   version = "5.1.1";
 
 in
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -21,21 +21,23 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper
+    cmake gettext pkgconfig extra-cmake-modules makeWrapper wrapGAppsHook
   ];
 
   buildInputs = [
+    kdevelop-pg-qt
+    llvmPackages.llvm llvmPackages.clang-unwrapped
+  ];
+
+  propagatedBuildInputs = [
     qtquickcontrols qtwebkit
     kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
     kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
     threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
-    kdevplatform kdevelop-pg-qt shared_mime_info libksysguard konsole.unwrapped
+    kdevplatform shared_mime_info libksysguard konsole
-    llvmPackages.llvm llvmPackages.clang-unwrapped
   ];
 
   postInstall = ''
-    wrapQtProgram "$out/bin/kdevelop"
-    
     # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
     wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
 
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
     sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = [ maintainers.ambrop72 ];
     platforms = platforms.linux;
     description = "KDE official IDE";
@@ -60,6 +62,6 @@ stdenv.mkDerivation rec {
         libraries and is under development since 1998.
       '';
     homepage = https://www.kdevelop.org;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    license = with licenses; [ gpl2Plus lgpl2Plus ];
   };
 }

pkgs/applications/editors/kile/default.nix

@@ -3,7 +3,7 @@
 , fetchgit
 , extra-cmake-modules
 , kdoctools
-, kdeWrapper
+, wrapGAppsHook
 , qtscript
 , kconfig
 , kcrash
@@ -21,8 +21,6 @@
 , poppler
 }:
 
-let
-  unwrapped =
 mkDerivation rec {
   name = "kile-${version}";
   version = "2017-02-09";
@@ -34,9 +32,9 @@ let
 
   };
 
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
 
-      buildInputs = [
+  propagatedBuildInputs = [
     kconfig
     kcrash
     kdbusaddons
@@ -49,22 +47,17 @@ let
     kparts
     ktexteditor
     kwindowsystem
-        okular.unwrapped
+    okular
     poppler
     qtscript
   ];
 
+  propagatedUserEnvPkgs = [ konsole ];
+
   meta = {
     description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
     homepage = https://www.kde.org/applications/office/kile/;
     maintainers = with lib.maintainers; [ fridh ];
     license = lib.licenses.gpl2Plus;
   };
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kile" ];
-  paths = [ konsole.unwrapped okular.unwrapped ];
 }

pkgs/applications/graphics/digikam/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -44,7 +44,7 @@
 , oxygen
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name    = "digikam-${version}";
   version = "5.4.0";
 
@@ -53,26 +53,11 @@ stdenv.mkDerivation rec {
     sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
 
   patches = [ ./0001-Disable-fno-operator-names.patch ];
 
   buildInputs = [
-    qtbase
-    qtxmlpatterns
-    qtsvg
-    qtwebkit
-
-    kconfigwidgets
-    kcoreaddons
-    kdoctools
-    kfilemetadata
-    knotifications
-    knotifyconfig
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-
     bison
     boost
     eigen
@@ -86,12 +71,28 @@ stdenv.mkDerivation rec {
     liblqr1
     libqtav
     libusb1
-    marble.unwrapped
     mysql
     opencv
-    threadweaver
+  ];
 
+  propagatedBuildInputs = [
+    qtbase
+    qtxmlpatterns
+    qtsvg
+    qtwebkit
+
+    kconfigwidgets
+    kcoreaddons
+    kfilemetadata
+    knotifications
+    knotifyconfig
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+
+    marble
     oxygen
+    threadweaver
   ];
 
   enableParallelBuilding = true;
@@ -104,22 +105,18 @@ stdenv.mkDerivation rec {
     "-DENABLE_MEDIAPLAYER=1"
   ];
 
-  fixupPhase = ''
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
     substituteInPlace $out/bin/digitaglinktree \
       --replace "/usr/bin/perl" "${perl}/bin/perl" \
       --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
-
-    wrapQtProgram $out/bin/digikam \
-      --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
-
-    wrapQtProgram $out/bin/showfoto
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Photo Management Program";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    maintainers = with maintainers; [ the-kenny ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

pkgs/applications/kde/ark/default.nix

@@ -1,7 +1,7 @@
 {
-  mkDerivation, lib, config, kdeWrapper,
+  mkDerivation, lib, config, wrapGAppsHook,
 
-  extra-cmake-modules, kdoctools, makeWrapper,
+  extra-cmake-modules, kdoctools,
 
   karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
   kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
@@ -13,35 +13,26 @@
   unfreeEnableUnrar ? false, unrar,
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "ark";
   nativeBuildInputs = [
-        extra-cmake-modules kdoctools makeWrapper
+    extra-cmake-modules kdoctools wrapGAppsHook
   ];
   propagatedBuildInputs = [
     khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
     kpty kwidgetsaddons libarchive kitemmodels
   ];
-      postInstall =
+  preFixup =
     let
       PATH =
         lib.makeBinPath
         ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
     in ''
-          wrapProgram "$out/bin/ark" \
+      gappsWrapperArgs+=(--prefix PATH : "${PATH}")
-              --prefix PATH : "${PATH}"
     '';
   meta = {
     license = with lib.licenses;
       [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
     maintainers = [ lib.maintainers.ttuegel ];
   };
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/ark" ];
 }

pkgs/applications/kde/dolphin-plugins.nix

@@ -12,6 +12,6 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
-    dolphin.unwrapped kdelibs4support ki18n kio kxmlgui
+    dolphin kdelibs4support ki18n kio kxmlgui
   ];
 }

pkgs/applications/kde/dolphin.nix

@@ -1,32 +1,23 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools, makeQtWrapper,
+  extra-cmake-modules, kdoctools,
   baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
   kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
   kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
   konsole, kparts, ktexteditor, kwindowsystem, phonon, solid
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "dolphin";
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
     kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
     kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
     phonon solid
   ];
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/dolphin" ];
-  paths = [ dolphin-plugins konsole.unwrapped ];
 }

pkgs/applications/kde/filelight.nix

@@ -1,24 +1,17 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kio, kparts, kxmlgui, qtscript, solid
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "filelight";
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ fridh vcunat ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     kio kparts kxmlgui qtscript solid
   ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/filelight" ];
 }

pkgs/applications/kde/gwenview.nix

@@ -1,27 +1,20 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
   libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "gwenview";
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
     libkipi phonon qtimageformats qtsvg qtx11extras
   ];
-    };
+  propagatedUserEnvPkgs = [ kipi-plugins ];
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/gwenview" ];
-  paths = [ kipi-plugins ];
 }

pkgs/applications/kde/k3b.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, lib, kdeWrapper, extra-cmake-modules
+{ mkDerivation, lib, wrapGAppsHook, extra-cmake-modules
 , qtwebkit
 , libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
@@ -7,8 +7,6 @@
 , ffmpeg, libmusicbrainz2, normalize, sox, transcode
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "k3b";
   meta = with lib; {
@@ -16,7 +14,7 @@ let
     maintainers = with maintainers; [ sander phreedom ];
     platforms = platforms.linux;
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     # qt
     qtwebkit
@@ -31,11 +29,12 @@ let
     # others
     ffmpeg libmusicbrainz2
   ];
-      enableParallelBuilding = true;
+  preFixup =
-    };
+    let k3bPath = lib.makeBinPath [
-
+          cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
-in kdeWrapper {
+          vcdimager
-  inherit unwrapped;
+        ];
-  targets = [ "bin/k3b" ];
+    in ''
-  paths = [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ];
+      gappsWrapperArgs+=(--prefix PATH : "${k3bPath}")
+    '';
 }

pkgs/applications/kde/kate.nix

@@ -1,32 +1,24 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
   kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
   plasma-framework, qtscript, threadweaver
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "kate";
   meta = {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
     qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
     kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
     knewstuff libgit2
   ];
-    };
+  propagatedUserEnvPkgs = [ konsole ];
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kate" "bin/kwrite" ];
-  paths = [ konsole.unwrapped ];
 }

pkgs/applications/kde/kcachegrind.nix

@@ -1,28 +1,20 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kio, ki18n,
   perl, python, php
 }:
 
-kdeWrapper {
+mkDerivation {
-  unwrapped = mkDerivation {
   name = "kcachegrind";
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ orivej ];
   };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-    buildInputs = [ perl python php kio ki18n ];
+  propagatedBuildInputs = [ kio ];
-    enableParallelBuilding = true;
+  buildInputs = [ perl python php ki18n ];
-  };
+  preFixup = ''
-
+    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ perl php python]}")
-  targets = [
+  '';
-    "bin/kcachegrind"
-    "bin/dprof2calltree"    # perl
-    "bin/hotshot2calltree"  # python
-    "bin/memprof2calltree"  # perl
-    "bin/op2calltree"       # perl
-    "bin/pprof2calltree"    # php
-  ];
 }

pkgs/applications/kde/kcalc.nix

@@ -1,24 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "kcalc";
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.fridh ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [ gmp ];
   propagatedBuildInputs = [
-        gmp kconfig kconfigwidgets kguiaddons kinit knotifications
+    kconfig kconfigwidgets kguiaddons kinit knotifications
   ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kcalc" ];
 }

pkgs/applications/kde/kcolorchooser.nix

@@ -1,21 +1,16 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui
+  extra-cmake-modules, wrapGAppsHook,
+  ki18n, kwidgetsaddons, kxmlgui
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "kcolorchooser";
   meta = {
     license = with lib.licenses; [ mit ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-      nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
-      propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
+  buildInputs = [ ki18n ];
-    };
+  propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kcolorchooser" ];
 }

pkgs/applications/kde/kcontacts.nix

@@ -10,6 +10,7 @@ mkDerivation {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules ki18n ];
+  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kconfig kcodecs ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons kconfig kcodecs ];
 }

pkgs/applications/kde/kdenlive.nix

@@ -1,8 +1,8 @@
 { mkDerivation
-, kdeWrapper
 , lib
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , qtscript
 , kactivities
 , kconfig
@@ -31,8 +31,7 @@
 , qtquickcontrols
 }:
 
-let
+mkDerivation {
-unwrapped = mkDerivation {
   name = "kdenlive";
   patches = [
     ./kdenlive-cmake-concurrent-module.patch
@@ -40,6 +39,7 @@ unwrapped = mkDerivation {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    wrapGAppsHook
   ];
   buildInputs = [
     qtscript
@@ -61,25 +61,12 @@ unwrapped = mkDerivation {
     ffmpeg
   ];
   propagatedBuildInputs = [
-    kactivities
+    kactivities kconfig kcrash kguiaddons kiconthemes kinit kio kio-extras
-    ki18n
+    kdbusaddons kfilemetadata knotifications knewstuff karchive knotifyconfig
-    kio
+    kplotting ktextwidgets kwindowsystem plasma-framework
-    kio-extras
+    phonon-backend-gstreamer qtquickcontrols shared_mime_info
-    kwindowsystem
-    kfilemetadata
-    plasma-framework
-    phonon-backend-gstreamer
-    qtquickcontrols
   ];
-  enableParallelBuilding = true;
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
   };
-};
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kdenlive" ];
-  paths = [ kinit ];
 }

pkgs/applications/kde/kdf.nix

@@ -1,24 +1,15 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kcmutils
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "kdf";
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.peterhoeg ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-      propagatedBuildInputs = [
+  propagatedBuildInputs = [ kcmutils ];
-        kcmutils
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kdf" ];
 }

pkgs/applications/kde/kgpg.nix

@@ -1,6 +1,6 @@
 {
-  mkDerivation, lib, makeQtWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools, ki18n,
+  extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook,
   akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
   kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
   ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
@@ -8,14 +8,14 @@
 
 mkDerivation {
   name = "kgpg";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ];
   buildInputs = [
     akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
     kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
-    kwidgetsaddons kwindowsystem makeQtWrapper
+    kwidgetsaddons kwindowsystem
   ];
-  postInstall = ''
+  preFixup = ''
-    wrapQtProgram $out/bin/kgpg --suffix PATH : ${lib.makeBinPath [ gnupg1 ]}
+    gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]})
   '';
   meta = {
     license = [ lib.licenses.gpl2 ];

pkgs/applications/kde/khelpcenter.nix

@@ -1,22 +1,15 @@
 {
-  mkDerivation, kdeWrapper,
+  mkDerivation,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
   kdelibs4support, khtml, kservice, xapian
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "khelpcenter";
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   buildInputs = [
     grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
     kinit kcmutils kservice xapian
   ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/khelpcenter" ];
 }

pkgs/applications/kde/kig.nix

@@ -1,26 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "kig";
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ raskin ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   buildInputs = [
     kparts qtsvg qtxmlpatterns ktexteditor boost
   ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kig" ];
 }
 
-

pkgs/applications/kde/kmix.nix

@@ -1,19 +1,17 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
   plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "kmix";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.rongcuid ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
   propagatedBuildInputs = [
     kglobalaccel kxmlgui kcoreaddons kdelibs4support
@@ -22,9 +20,4 @@ let
   cmakeFlags = [
     "-DKMIX_KF5_BUILD=1"
   ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kmix" ];
 }

pkgs/applications/kde/kolourpaint.nix

@@ -1,28 +1,18 @@
 { lib
 , mkDerivation
-, kdeWrapper
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , kdelibs4support
 , libkexiv2
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "kolourpaint";
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-      propagatedBuildInputs = [
+  propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
-        kdelibs4support
-        libkexiv2
-      ];
-
   meta = {
     maintainers = [ lib.maintainers.fridh ];
     license = with lib.licenses; [ gpl2 ];
   };
-    };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = ["bin/kolourpaint"];
 }

pkgs/applications/kde/kompare.nix

@@ -1,21 +1,14 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "kompare";
   meta = { license = with lib.licenses; [ gpl2 ]; };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     kparts ktexteditor kwidgetsaddons libkomparediff2
   ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kompare" ];
 }

pkgs/applications/kde/konsole.nix

@@ -1,30 +1,23 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
   knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
   kwindowsystem, kxmlgui, qtscript
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "konsole";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
     kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
     knotifications knotifyconfig kparts kpty kservice ktextwidgets
     kwidgetsaddons kxmlgui
   ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konsole" ];
 }

pkgs/applications/kde/krfb.nix

@@ -1,22 +1,15 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kdelibs4support, kdnssd, libvncserver, libXtst
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "krfb";
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = with lib.maintainers; [ jerith666 ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krfb" ];
 }

pkgs/applications/kde/kwalletmanager.nix

@@ -1,8 +1,8 @@
 { lib
 , mkDerivation
-, kdeWrapper
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , kauth
 , kcmutils
 , kconfigwidgets
@@ -12,25 +12,15 @@
 , kxmlgui
 }:
 
-let
+mkDerivation {
-  unwrapped = mkDerivation {
   name = "kwalletmanager";
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ fridh ];
   };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
-      kauth
+    kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
-      kcmutils
-      kconfigwidgets
-      kcoreaddons
-      kdbusaddons
-      kdelibs4support
     kxmlgui
   ];
-  };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = ["bin/kwalletmanager5"];
 }

pkgs/applications/kde/marble.nix

@@ -1,28 +1,16 @@
-{ mkDerivation, lib, kdeWrapper
+{ mkDerivation, lib
-, extra-cmake-modules, kdoctools
+, extra-cmake-modules, kdoctools, wrapGAppsHook
 , qtscript, qtsvg, qtquickcontrols, qtwebkit
 , krunner, shared_mime_info, kparts, knewstuff
 , gpsd, perl
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "marble";
   meta.license = with lib.licenses; [ lgpl21 gpl3 ];
-
+  nativeBuildInputs = [ extra-cmake-modules kdoctools perl wrapGAppsHook ];
-      nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
   propagatedBuildInputs = [
-        qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info
+    qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
-        krunner kparts knewstuff
+    knewstuff gpsd
-        gpsd
   ];
-
-      enableParallelBuilding = true;
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/marble-qt" "bin/marble" ];
-  paths = [ unwrapped ];
 }

pkgs/applications/kde/okteta.nix

@@ -1,26 +1,19 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "okteta";
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ peterhoeg ];
   };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     kconfig kinit
     kcmutils kconfigwidgets knewstuff kparts qca-qt5
   ];
-    };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/okteta" ];
 }

pkgs/applications/kde/okular.nix

@@ -1,16 +1,15 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
   libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
 }:
 
-let
+mkDerivation {
-  unwrapped = mkDerivation {
   name = "okular";
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
     kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
@@ -23,9 +22,4 @@ let
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/okular" ];
 }

pkgs/applications/kde/print-manager.nix

@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules, wrapGAppsHook,
   cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
   knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
   qtdeclarative
@@ -11,7 +11,7 @@ mkDerivation {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
   propagatedBuildInputs = [
     cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
     kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework

pkgs/applications/kde/spectacle.nix

@@ -1,25 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
+  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
   xcb-util-cursor
 }:
 
-let
-  unwrapped =
 mkDerivation {
   name = "spectacle";
   meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
     kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
   ];
-    };
+  propagatedUserEnvPkgs = [ kipi-plugins ];
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/spectacle" ];
-  paths = [ kipi-plugins ];
 }

pkgs/applications/misc/krename/default.nix

@@ -1,13 +1,13 @@
 {
-  mkDerivation, kdeWrapper, fetchFromGitHub, lib,
+  mkDerivation, fetchFromGitHub, lib,
-  extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
-  taglib, exiv2, podofo
+  kconfig, kinit, kjsembed, taglib, exiv2, podofo
 }:
 
 let
   pname = "krename";
   version = "20170610";
-  unwrapped = mkDerivation rec {
+in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
@@ -25,11 +25,6 @@ let
   };
 
   buildInputs = [ taglib exiv2 podofo ];
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [ kconfig kinit kjsembed ];
-  };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krename" ];
 }

pkgs/applications/misc/krusader/default.nix

@@ -1,13 +1,13 @@
 {
-  mkDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit, kparts
 }:
 
 let
   pname = "krusader";
   version = "2.6.0";
-  unwrapped = mkDerivation rec {
+in mkDerivation rec {
   name = "krusader-${version}";
 
   src = fetchurl {
@@ -22,11 +22,6 @@ let
     maintainers = with maintainers; [ sander ];
   };
 
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [ kconfig kinit kparts ];
-  };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krusader" ];
 }

pkgs/applications/misc/latte-dock/default.nix

@@ -1,8 +1,8 @@
-{ stdenv, lib, cmake, xorg, plasma-framework, fetchFromGitHub, kdeWrapper }:
+{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub }:
 
-let version = "0.6.0";
+let version = "0.6.0"; in
 
-    unwrapped = stdenv.mkDerivation {
+mkDerivation {
   name = "latte-dock-${version}";
 
   src = fetchFromGitHub {
@@ -16,18 +16,11 @@ let version = "0.6.0";
 
   nativeBuildInputs = [ cmake ];
 
-      enableParallelBuilding = true;
+  meta = with lib; {
-
-      meta = with stdenv.lib; {
     description = "Dock-style app launcher based on Plasma frameworks";
     homepage = https://github.com/psifidotos/Latte-Dock;
     license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ maintainers.benley ];
   };
-    };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/latte-dock" ];
 }

pkgs/applications/misc/yakuake/default.nix

@@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , kdoctools
-, kdeWrapper
+, wrapGAppsHook
 , extra-cmake-modules
 , karchive
 , kcrash
@@ -18,7 +18,6 @@
 }:
 
 let
-  unwrapped = let
   pname = "yakuake";
   version = "3.0.3";
 in mkDerivation rec {
@@ -42,8 +41,23 @@ let
       kwindowsystem
     ];
 
+  propagatedBuildInputs = [
+    karchive
+    kcrash
+    kdbusaddons
+    ki18n
+    kiconthemes
+    knewstuff
+    knotifications
+    knotifyconfig
+    kparts
+    kwindowsystem
+  ];
+
+  propagatedUserEnvPkgs = [ konsole ];
+
   nativeBuildInputs = [
-      extra-cmake-modules kdoctools
+    extra-cmake-modules kdoctools wrapGAppsHook
   ];
 
   meta = {
@@ -51,13 +65,4 @@ let
     description = "Quad-style terminal emulator for KDE";
     maintainers = with lib.maintainers; [ fridh ];
   };
-  };
-
-
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/yakuake" ];
-  paths = [ konsole.unwrapped ];
 }

pkgs/applications/networking/irc/konversation/default.nix

@@ -2,14 +2,14 @@
 , lib
 , fetchurl
 , extra-cmake-modules
+, kdoctools
+, wrapGAppsHook
 , kbookmarks
 , karchive
 , kconfig
 , kconfigwidgets
 , kcoreaddons
 , kdbusaddons
-, kdeWrapper
-, kdoctools
 , kemoticons
 , kglobalaccel
 , ki18n
@@ -28,7 +28,6 @@
 }:
 
 let
-  unwrapped = let
   pname = "konversation";
   version = "1.6.2";
 in mkDerivation rec {
@@ -66,6 +65,7 @@ let
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    wrapGAppsHook
   ];
 
   meta = {
@@ -74,9 +74,4 @@ let
     maintainers = with lib.maintainers; [ fridh ];
     homepage = https://konversation.kde.org;
   };
-  };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konversation" ];
 }
-

pkgs/build-support/kde/wrapper.nix

@@ -1,68 +0,0 @@
-{ stdenv, lib, makeWrapper, buildEnv, gtk3, dconf }:
-
-packages:
-
-let
-  packages_ = if builtins.isList packages then packages else [packages];
-
-  unwrapped = lib.concatMap (p: if builtins.isList p.unwrapped then p.unwrapped else [p.unwrapped]) packages_;
-  targets = lib.concatMap (p: p.targets) packages_;
-  paths = lib.concatMap (p: p.paths or []) packages_;
-
-  name =
-    if builtins.length unwrapped == 1
-    then (lib.head unwrapped).name
-    else "kde-application";
-  meta =
-    if builtins.length unwrapped == 1
-    then (lib.head unwrapped).meta
-    else {};
-
-  env = buildEnv {
-    inherit name meta;
-    paths = builtins.map lib.getBin (unwrapped ++ paths);
-    pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ];
-  };
-in
-
-stdenv.mkDerivation {
-  inherit name meta;
-  preferLocalBuild = true;
-
-  inherit unwrapped env targets;
-
-  passthru = {
-    inherit targets paths;
-    unwrapped = if builtins.length unwrapped == 1 then lib.head unwrapped else unwrapped;
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    for t in $targets; do
-        good=""
-        for drv in $unwrapped; do
-            if [ -a "$drv/$t" ]; then
-                makeWrapper "$drv/$t" "$out/$t" \
-                    --argv0 '"$0"' \
-                    --suffix PATH : "$env/bin" \
-                    --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
-                    --prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \
-                    --prefix QML_IMPORT_PATH : "$env/lib/qt5/imports" \
-                    --prefix QML2_IMPORT_PATH : "$env/lib/qt5/qml" \
-                    --prefix QT_PLUGIN_PATH : "$env/lib/qt5/plugins" \
-                    --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules"
-                good="1"
-                break
-            fi
-        done
-        if [ -z "$good" ]; then
-            echo "file or directory not found in derivations: $t"
-            exit 1
-        fi
-    done
-
-    mkdir -p "$out/nix-support"
-    echo "$unwrapped" > "$out/nix-support/propagated-user-env-packages"
-  '';
-}

pkgs/desktops/plasma-5/oxygen.nix

@@ -1,21 +1,15 @@
 {
-  mkDerivation, kdeWrapper,
+  mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
   ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
 }:
 
-let
+mkDerivation {
-  unwrapped = mkDerivation {
   name = "oxygen";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
     ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
   ];
-  };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ];
 }

pkgs/tools/misc/kronometer/default.nix

@@ -1,13 +1,14 @@
 {
-  mkDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit
 }:
 
 let
   pname = "kronometer";
   version = "2.1.3";
-  unwrapped = mkDerivation rec {
+in
+mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -19,11 +20,6 @@ let
     license = licenses.gpl2;
     maintainers = with maintainers; [ peterhoeg ];
   };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   propagatedBuildInputs = [ kconfig kinit ];
-  };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kronometer" ];
 }

pkgs/tools/misc/partition-manager/default.nix

@@ -1,11 +1,11 @@
-{ mkDerivation, kdeWrapper, fetchurl, lib
+{ mkDerivation, fetchurl, lib
-, extra-cmake-modules, kdoctools
+, extra-cmake-modules, kdoctools, wrapGAppsHook
 , kconfig, kinit, kpmcore
 , eject, libatasmart }:
 
 let
   pname = "partitionmanager";
-  unwrapped = mkDerivation rec {
+in mkDerivation rec {
   name = "${pname}-${version}";
   version = "3.0.1";
 
@@ -19,13 +19,8 @@ let
     license = licenses.gpl2;
     maintainers = with maintainers; [ peterhoeg ];
   };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   # refer to kpmcore for the use of eject
   buildInputs = [ eject libatasmart ];
   propagatedBuildInputs = [ kconfig kinit kpmcore ];
-  };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/partitionmanager" ];
 }

pkgs/tools/misc/peruse/default.nix

@@ -1,6 +1,6 @@
 {
-  mkDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
+  mkDerivation, fetchFromGitHub, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
 
@@ -13,7 +13,7 @@ let
     rev    = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
     sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
   };
-  unwrapped = mkDerivation rec {
+in mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -21,7 +21,7 @@ let
     sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
   };
 
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
 
   propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
 
@@ -37,9 +37,4 @@ let
     maintainers = with maintainers; [ peterhoeg ];
   };
 
-  };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/peruse" "bin/perusecreator" ];
 }

pkgs/tools/security/kwalletcli/default.nix

@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, fetchurl, lib,
   pkgconfig,
   kcoreaddons, ki18n, kwallet,
   mksh
@@ -8,8 +8,8 @@
 let
   pname = "kwalletcli";
   version = "3.00";
-
+in
-  unwrapped = kdeDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -34,6 +34,7 @@ let
   nativeBuildInputs = [ pkgconfig ];
   # if using just kwallet, cmake will be added as a buildInput and fail the build
   propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
+  propagatedUserEnvPkgs = [ mksh ];
 
   preInstall = ''
     mkdir -p $out/bin $out/share/man/man1
@@ -45,11 +46,4 @@ let
     license = licenses.miros;
     maintainers = with maintainers; [ peterhoeg ];
   };
-  };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = map (b: "bin/" + b)
-    [ "kwalletaskpass" "kwalletcli" "kwalletcli_getpin" "pinentry-kwallet" ];
-  paths = [ mksh ];
 }

pkgs/tools/text/kdiff3/default.nix

@@ -1,10 +1,10 @@
 {
-  mkDerivation, lib, kdeWrapper, fetchgit, fetchpatch,
+  mkDerivation, lib, fetchgit, fetchpatch,
-  extra-cmake-modules, kdoctools, kconfig, kinit, kparts
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  kconfig, kinit, kparts
 }:
 
-let
+mkDerivation rec {
-  unwrapped = mkDerivation rec {
   name = "kdiff3-${version}";
   version = "1.7.0-2017-02-19";
 
@@ -30,7 +30,7 @@ let
     sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
   '';
 
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
 
   propagatedBuildInputs = [ kconfig kinit kparts ];
 
@@ -41,9 +41,4 @@ let
     maintainers = with maintainers; [ viric peterhoeg ];
     platforms = with platforms; linux;
   };
-  };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kdiff3" ];
 }

pkgs/top-level/all-packages.nix

@@ -292,10 +292,6 @@ with pkgs;
       inherit kernel rootModules allowMissing;
     };
 
-  kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
-    inherit (gnome3) dconf;
-  };
-
   nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;