Merge branch 'kde-5' into staging

2016-05-01 06:43:56 -05:00 · 2016-05-01 06:43:56 -05:00 · c5b88434e9
commit c5b88434e9
parent 36d50d2e6c f90a7bf354
144 changed files with 1049 additions and 945 deletions
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@ -114,10 +114,12 @@ in {
      # Ugly hack for using the correct gnome3 packageSet
      basePackages = mkOption {
        type = types.attrsOf types.package;
-        default = { inherit networkmanager modemmanager wpa_supplicant
+        default = { inherit modemmanager wpa_supplicant
                            networkmanager_openvpn networkmanager_vpnc
                            networkmanager_openconnect
-                            networkmanager_pptp networkmanager_l2tp; };
+                            networkmanager_pptp networkmanager_l2tp;
+                    networkmanager = networkmanager.out;
+                  };
        internal = true;
      };

--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@ -105,12 +105,6 @@ in

        pkgs.phonon-backend-gstreamer
        pkgs.kde5.phonon-backend-gstreamer
-        pkgs.gst_all_1.gstreamer
-        pkgs.gst_all_1.gst-plugins-base
-        pkgs.gst_all_1.gst-plugins-good
-        pkgs.gst_all_1.gst-plugins-ugly
-        pkgs.gst_all_1.gst-plugins-bad
-        pkgs.gst_all_1.gst-libav # for mp3 playback
      ]

      # Plasma 5.5 and later has a Breeze GTK theme.
@ -138,14 +132,23 @@ in
      target = "X11/xkb";
    };

-    environment.profileRelativeEnvVars = {
-      GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
-    };
-
    # Enable GTK applications to load SVG icons
-    environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {
-      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
-    };
+    environment.variables =
+      {
+        GST_PLUGIN_SYSTEM_PATH_1_0 =
+          lib.makeSearchPath "/lib/gstreamer-1.0"
+          (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
+            gstreamer
+            gst-plugins-base
+            gst-plugins-good
+            gst-plugins-ugly
+            gst-plugins-bad
+            gst-libav # for mp3 playback
+          ]));
+      }
+      // (if (lib.hasAttr "breeze-icons" kde5)
+          then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
+          else { });

    fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];

--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation {
    sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
  };

-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ];

  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
    # polkit requires pam, which requires shadow.h, which is not available on
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@ -9,16 +9,22 @@ stdenv.mkDerivation rec {
    sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
  };

+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
+
+  outputs = [ "dev" "out" ];
+
  preBuild = ''
    sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile
  '';

-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
+  preFixup = ''
+    moveToOutput "bin/orbit2-config" "$dev"
+  '';

  meta = with stdenv.lib; {
    homepage    = https://projects.gnome.org/ORBit2/;
-    description = "A a CORBA 2.4-compliant Object Request Broker";
+    description = "A CORBA 2.4-compliant Object Request Broker";
    platforms   = platforms.unix;
    maintainers = with maintainers; [ lovek323 ];

--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
    sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
  };

+  outputs = [ "dev" "out" ];
+
  buildInputs =
    [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
      intltool gnome_mime_data avahi acl
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
    sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
  };

+  outputs = [ "dev" "out" ];
+
  preConfigure = # still using stuff deprecated in new glib versions
    "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in";

--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@ -2,12 +2,14 @@

 stdenv.mkDerivation {
  name = "libglade-2.6.4";
-  
+
  src = fetchurl {
    url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2;
    sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4";
  };
-  
+
+  outputs = [ "dev" "out" ];
+
  buildInputs = [ pkgconfig gtk python gettext ];

  propagatedBuildInputs = [ libxml2 ];
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
    sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
  };

+  outputs = [ "dev" "out" ];
+
  patches = [ ./new-glib.patch ];

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
    sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
  };

+  outputs = [ "dev" "out" ];
+
  buildInputs = [ libglade ];
  nativeBuildInputs = [ pkgconfig intltool ];
  propagatedBuildInputs = [ libart_lgpl gtk ];
--- a/pkgs/desktops/kde-5/applications-16.04/ark.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/ark.nix
@ -31,21 +31,9 @@ kdeApp {
    extra-cmake-modules
    kdoctools
  ];
-  buildInputs = [
-    karchive
-    kconfig
-    kcrash
-    kdbusaddons
-    kiconthemes
-    kservice
-    kpty
-    kwidgetsaddons
-    libarchive
-  ];
  propagatedBuildInputs = [
-    khtml
-    ki18n
-    kio
+    khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
+    kpty kwidgetsaddons libarchive
  ];
  postInstall = ''
    wrapQtProgram "$out/bin/ark" \
--- a/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
@ -13,23 +13,15 @@

 kdeApp {
  name = "baloo-widgets";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kservice
-  ];
-  propagatedBuildInputs = [
-    baloo
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
-  ];
  meta = {
    license = [ lib.licenses.lgpl21 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    baloo kconfig kservice kdelibs4support kfilemetadata ki18n kio
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
@ -11,21 +11,15 @@

 kdeApp {
  name = "dolphin-plugins";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kxmlgui
-    dolphin
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kio
-  ];
  meta = {
    license = [ lib.licenses.gpl2 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kio kxmlgui dolphin
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
@ -29,42 +29,22 @@

 kdeApp {
  name = "dolphin";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
  nativeBuildInputs = [
    extra-cmake-modules
    kdoctools
    makeQtWrapper
  ];
-  buildInputs = [
-    kinit
-    kcmutils
-    kcoreaddons
-    knewstuff
-    kdbusaddons
-    kbookmarks
-    kconfig
-    kparts
-    solid
-    kiconthemes
-    kcompletion
-    knotifications
-    phonon
-    baloo-widgets
-  ];
  propagatedBuildInputs = [
-    baloo
-    kactivities
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
-    ktexteditor
+    kinit kcmutils kcoreaddons knewstuff kdbusaddons kbookmarks kconfig kparts
+    solid kiconthemes kcompletion knotifications phonon baloo-widgets baloo
+    kactivities kdelibs4support kfilemetadata ki18n kio ktexteditor
    kwindowsystem
  ];
  postInstall = ''
    wrapQtProgram "$out/bin/dolphin"
  '';
-  meta = {
-    license = with lib.licenses; [ gpl2 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
@ -7,15 +7,15 @@

 kdeApp {
  name = "ffmpegthumbs";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    ffmpeg
-    kio
-  ];
  meta = {
    license = with lib.licenses; [ gpl2 bsd3 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    ffmpeg
+    kio
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/filelight.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/filelight.nix
@ -12,24 +12,19 @@

 kdeApp {
  name = "filelight";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh vcunat ];
+  };
  nativeBuildInputs = [
    extra-cmake-modules
    kdoctools
    makeQtWrapper
  ];
-  buildInputs = [
-    kio
-    kparts
-    qtscript
-    solid
-    kxmlgui
+  propagatedBuildInputs = [
+    kio kparts qtscript solid kxmlgui
  ];
-
  postInstall = ''
    wrapQtProgram "$out/bin/filelight"
  '';
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ fridh vcunat ];
-  };
 }
--- a/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
@ -7,15 +7,14 @@

 kdeApp {
  name = "gpgmepp";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    boost
-    gpgme
-  ];
  meta = {
    license = with lib.licenses; [ lgpl21 bsd3 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    boost gpgme
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
@ -16,29 +16,19 @@

 kdeApp {
  name = "gwenview";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
  nativeBuildInputs = [
    extra-cmake-modules
    kdoctools
    makeQtWrapper
  ];
-  buildInputs = [
-    exiv2
-    lcms2
-    phonon
-    qtsvg
-  ];
  propagatedBuildInputs = [
-    baloo
-    kactivities
-    kdelibs4support
-    kio
-    qtx11extras
+    baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon qtsvg
  ];
  postInstall = ''
    wrapQtProgram "$out/bin/gwenview"
  '';
-  meta = {
-    license = with lib.licenses; [ gpl2 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/applications-16.04/kate.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kate.nix
@ -28,42 +28,22 @@

 kdeApp {
  name = "kate";
+  meta = {
+    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
  nativeBuildInputs = [
    extra-cmake-modules
    kdoctools
  ];
-  buildInputs = [
-    qtscript
-    kconfig
-    kcrash
-    kguiaddons
-    kiconthemes
-    kinit
-    kjobwidgets
-    kparts
-    kxmlgui
-    kdbusaddons
-    kwallet
-    kitemmodels
-    knotifications
-    threadweaver
-    knewstuff
-    libgit2
-  ];
  propagatedBuildInputs = [
-    kactivities
-    ki18n
-    kio
-    ktexteditor
-    kwindowsystem
-    plasma-framework
+    kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript
+    kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui
+    kdbusaddons kwallet kitemmodels knotifications threadweaver knewstuff
+    libgit2
  ];
  postInstall = ''
    wrapQtProgram "$out/bin/kate"
    wrapQtProgram "$out/bin/kwrite"
  '';
-  meta = {
-    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
@ -13,27 +13,18 @@

 kdeApp {
  name = "kcalc";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    gmp
-    kconfig
-    kconfigwidgets
-    kguiaddons
-    kinit
-    knotifications
-  ];
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcalc"
-  '';
-
  meta = {
    license = with lib.licenses; [ gpl2 ];
    maintainers = [ lib.maintainers.fridh ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    gmp kconfig kconfigwidgets kguiaddons kinit knotifications
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kcalc"
+  '';
 }
--- a/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
@ -5,12 +5,10 @@

 kdeApp {
  name = "kcolorchooser";
-
  meta = {
    license = with lib.licenses; [ mit ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
-
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n kwidgetsaddons kxmlgui ];
+  propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
@ -8,16 +8,14 @@

 kdeApp {
  name = "kdegraphics-thumbnailers";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kio
-    libkexiv2
-    libkdcraw
-  ];
  meta = {
    license = [ lib.licenses.lgpl21 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    kio libkexiv2 libkdcraw
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
@ -11,19 +11,15 @@

 kdeApp {
  name = "kdenetwork-filesharing";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kio
-    kwidgetsaddons
-    samba
-  ];
  meta = {
    license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    kcoreaddons ki18n kio kwidgetsaddons samba
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
@ -33,7 +33,7 @@ kdeApp {
    extra-cmake-modules kdoctools
    shared_mime_info
  ];
-  buildInputs = [
+  propagatedBuildInputs = [
    exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
    kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
    kpty libmtp libssh openexr openslp phonon qtsvg samba solid
--- a/pkgs/desktops/kde-5/applications-16.04/konsole.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/konsole.nix
@ -28,41 +28,19 @@

 kdeApp {
  name = "konsole";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    qtscript
-    kbookmarks
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kguiaddons
-    kiconthemes
-    kinit
-    kio
-    knotifications
-    knotifyconfig
-    kparts
-    kpty
-    kservice
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kwindowsystem
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/konsole"
-  '';
  meta = {
    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools makeQtWrapper
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig
+    kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio knotifications
+    knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kxmlgui
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/konsole"
+  '';
 }
--- a/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
@ -6,14 +6,14 @@

 kdeApp {
  name = "libkdcraw";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libraw
-  ];
  meta = {
    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    libraw
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
@ -6,14 +6,14 @@

 kdeApp {
  name = "libkexiv2";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    exiv2
-  ];
  meta = {
    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    exiv2
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
@ -9,14 +9,14 @@

 kdeApp {
  name = "libkipi";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kconfig ki18n kservice kxmlgui
-  ];
  meta = {
    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    kconfig ki18n kservice kxmlgui
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
@ -19,29 +19,16 @@

 kdeApp {
  name = "print-manager";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    cups
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kiconthemes
-    kcmutils
-    knotifications
-    kwidgetsaddons
-    kitemviews
-  ];
-  propagatedBuildInputs = [
-    ki18n
-    kio
-    kwindowsystem
-    plasma-framework
-    qtdeclarative
-  ];
  meta = {
    license = [ lib.licenses.gpl2 ];
    maintainers = [ lib.maintainers.ttuegel ];
  };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
+    kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
+    qtdeclarative
+  ];
 }
--- a/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
@ -19,17 +19,17 @@

 kdeApp {
  name = "spectacle";
+  meta = with lib; {
+    maintainers = with maintainers; [ ttuegel ];
+  };
  nativeBuildInputs = [
    extra-cmake-modules kdoctools makeQtWrapper
  ];
-  buildInputs = [
+  propagatedBuildInputs = [
    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
  ];
  postFixup = ''
    wrapQtProgram "$out/bin/spectacle"
  '';
-  meta = with lib; {
-    maintainers = with maintainers; [ ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
@ -6,11 +6,9 @@
 kdeFramework {
  name = "baloo";
  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    kconfig kcrash kdbusaddons lmdb qtquick1 solid
-  ];
  propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
+    kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
+    kidletime lmdb qtbase qtquick1 solid
  ];
  postInstall = ''
    wrapQtProgram "$out/bin/baloo_file"
--- a/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
@ -6,7 +6,7 @@
 kdeFramework {
  name = "bluez-qt";
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtdeclarative ];
  preConfigure = ''
    substituteInPlace CMakeLists.txt \
      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
--- a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
@ -5,6 +5,7 @@

 kdeFramework {
  name = "breeze-icons";
+  outputs = [ "out" ];
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtsvg ];
+  propagatedBuildInputs = [ qtsvg ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
@ -112,7 +112,7 @@ let
    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework {};
+    plasma-framework = callPackage ./plasma-framework.nix {};
    solid = callPackage ./solid.nix {};
    sonnet = callPackage ./sonnet.nix {};
    threadweaver = callPackage ./threadweaver.nix {};
--- a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
@ -10,12 +10,7 @@ _ecmPropagateSharedData() {
        "kconf_update" \
        "kservices5" \
        "kservicetypes5" \
-        "kxmlgui5" \
        "knotifications5" \
-        "icons" \
-        "sounds" \
-        "templates" \
-        "wallpapers" \
        "applications" \
        "desktop-directories" \
        "mime" \
@ -26,7 +21,6 @@ _ecmPropagateSharedData() {
    for dir in ${sharedPaths[@]}; do
        if [ -d "$1/share/$dir" ]; then
            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
-            propagateOnce propagatedBuildInputs "$1"
            propagateOnce propagatedUserEnvPkgs "$1"
            break
        fi
--- a/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
@ -5,13 +5,10 @@

 kdeFramework {
  name = "frameworkintegration";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
-    libXcursor
+  propagatedBuildInputs = [
+    kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio
+    kiconthemes kwidgetsaddons libXcursor qtx11extras
  ];
-  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
@ -5,5 +5,5 @@ kdeFramework {
  name = "kactivities-stats";
  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ boost kactivities kconfig ];
+  propagatedBuildInputs = [ boost kactivities kconfig ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
@ -5,15 +5,10 @@

 kdeFramework {
  name = "kactivities";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
-    kxmlgui
-  ];
  propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
+    boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
+    ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
@ -5,8 +5,6 @@

 kdeFramework {
  name = "kapidox";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
@ -4,8 +4,6 @@

 kdeFramework {
  name = "karchive";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
@ -6,11 +6,8 @@

 kdeFramework {
  name = "kauth";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ polkit-qt ];
-  propagatedBuildInputs = [ kcoreaddons ];
+  propagatedBuildInputs = [ kcoreaddons polkit-qt ];
  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
@ -10,16 +10,9 @@

 kdeFramework {
  name = "kbookmarks";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kiconthemes
-    kxmlgui
+  propagatedBuildInputs = [
+    kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
@ -5,13 +5,11 @@

 kdeFramework {
  name = "kcmutils";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
+  propagatedBuildInputs = [
+    kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
+    kpackage kservice kxmlgui
  ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
@ -6,9 +6,7 @@

 kdeFramework {
  name = "kcompletion";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kwidgetsaddons ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
@ -4,15 +4,12 @@

 kdeFramework {
  name = "kconfigwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
+  propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ];
  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
  postInstall = ''
    moveToOutput "bin/preparetips5" "$dev"
    wrapQtProgram "$dev/bin/preparetips5"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
@ -5,12 +5,10 @@

 kdeFramework {
  name = "kcoreaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ shared_mime_info ];
+  propagatedBuildInputs = [ shared_mime_info ];
  postInstall = ''
    wrapQtProgram "$out/bin/desktoptojson"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
@ -7,10 +7,7 @@

 kdeFramework {
  name = "kcrash";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
@ -6,17 +6,13 @@

 kdeFramework {
  name = "kdeclarative";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    epoxy kguiaddons kiconthemes kwidgetsaddons
-  ];
  propagatedBuildInputs = [
-    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
+    epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
+    kwidgetsaddons kwindowsystem qtdeclarative
  ];
  postInstall = ''
    wrapQtProgram "$out/bin/kpackagelauncherqml"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
@ -11,9 +11,7 @@

 kdeFramework {
  name = "kded";
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
@ -1,32 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
@ -12,25 +12,20 @@

 kdeFramework {
  name = "kdelibs4support";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  outputs = [ "dev" "out" ];
  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
  setupHook = ./setup-hook.sh;
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
+    kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
+    kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
+    kio kiconthemes kitemmodels kinit knotifications kparts kservice
+    ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui
+    networkmanager qtsvg qtx11extras xlibs.libSM
  ];
  cmakeFlags = [
    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
    "-DDocBookXML4_DTD_VERSION=4.5"
  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
@ -18,17 +18,13 @@

 kdeFramework {
  name = "kdesignerplugin";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
-    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
-    kxmlgui
+  propagatedBuildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kio
+    kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
  ];
-  propagatedBuildInputs = [ kio sonnet ];
  postInstall = ''
    wrapQtProgram "$out/bin/kgendesignerplugin"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
@ -4,10 +4,7 @@

 kdeFramework {
  name = "kdesu";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ ki18n kpty ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
@ -4,10 +4,9 @@

 kdeFramework {
  name = "kdewebkit";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ ki18n kio qtwebkit ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet qtwebkit
+  ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
@ -5,9 +5,7 @@

 kdeFramework {
  name = "kdnssd";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ avahi ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
@ -4,16 +4,13 @@

 kdeFramework {
  name = "kdoctools";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ karchive ki18n ];
  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
  cmakeFlags = [
    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
  ];
  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
@ -8,10 +8,7 @@

 kdeFramework {
  name = "kemoticons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive kconfig kcoreaddons ];
-  propagatedBuildInputs = [ kservice ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
--- a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
@ -4,11 +4,10 @@

 kdeFramework {
  name = "kfilemetadata";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [
+    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
+  ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
@ -11,13 +11,12 @@

 kdeFramework {
  name = "kglobalaccel";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  propagatedBuildInputs = [
+    kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras
+  ];
  postInstall = ''
    wrapQtProgram "$out/bin/kglobalaccel5"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
@ -5,9 +5,7 @@

 kdeFramework {
  name = "kguiaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtx11extras ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
@ -6,16 +6,11 @@

 kdeFramework {
  name = "khtml";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kxmlgui phonon
-  ];
  propagatedBuildInputs = [
-    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
-    kwindowsystem qtx11extras sonnet
+    giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
+    knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem
+    kxmlgui phonon qtx11extras sonnet
  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
@ -8,10 +8,8 @@

 kdeFramework {
  name = "ki18n";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative qtscript ];
+  propagatedBuildInputs = [ qtdeclarative qtscript ];
  propagatedNativeBuildInputs = [ gettext python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
@ -5,14 +5,11 @@

 kdeFramework {
  name = "kiconthemes";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
-  propagatedBuildInputs = [ breeze-icons ki18n ];
+  propagatedBuildInputs = [ breeze-icons kconfigwidgets ki18n kitemviews qtsvg ];
  postInstall = ''
    wrapQtProgram "$out/bin/kiconfinder5"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
@ -6,10 +6,7 @@

 kdeFramework {
  name = "kidletime";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtbase qtx11extras ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
@ -5,9 +5,7 @@

 kdeFramework {
  name = "kimageformats";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
@ -3,15 +3,12 @@
 , libcap_progs
 }:

-# TODO: setuid wrapper
-
 kdeFramework {
  name = "kinit";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
+  propagatedBuildInputs = [
+    kconfig kcrash ki18n kio kservice kwindowsystem libcap
+  ];
  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
@ -9,17 +9,15 @@

 kdeFramework {
  name = "kio";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons
-    qtscript
-  ];
  propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kwindowsystem kxmlgui solid qtx11extras
+    acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
+    kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
+    ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
+    qtx11extras
  ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
  postInstall = ''
    wrapQtProgram "$out/bin/kcookiejar5"
    wrapQtProgram "$out/bin/ktelnetservice5"
@ -27,7 +25,4 @@ kdeFramework {
    wrapQtProgram "$out/bin/kmailservice5"
    wrapQtProgram "$out/bin/protocoltojson"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
@ -4,8 +4,6 @@

 kdeFramework {
  name = "kitemmodels";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
@ -4,8 +4,6 @@

 kdeFramework {
  name = "kitemviews";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
@ -7,10 +7,7 @@

 kdeFramework {
  name = "kjobwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons ];
-  propagatedBuildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
@ -6,11 +6,9 @@

 kdeFramework {
  name = "kjs";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
  postInstall = ''
    wrapQtProgram "$out/bin/kjs5"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
@ -4,14 +4,11 @@

 kdeFramework {
  name = "kjsembed";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ qtsvg ];
-  propagatedBuildInputs = [ ki18n kjs ];
+  propagatedBuildInputs = [ ki18n kjs qtsvg ];
  postInstall = ''
    wrapQtProgram "$out/bin/kjscmd5"
    wrapQtProgram "$out/bin/kjsconsole"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
@ -6,10 +6,7 @@

 kdeFramework {
  name = "kmediaplayer";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kparts kxmlgui ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
@ -5,13 +5,10 @@

 kdeFramework {
  name = "knewstuff";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kcompletion kconfig kcoreaddons kiconthemes
-    kitemviews ktextwidgets kwidgetsaddons
+  propagatedBuildInputs = [
+    attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
+    kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
  ];
-  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
@ -8,12 +8,9 @@

 kdeFramework {
  name = "knotifications";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs kconfig kcoreaddons libdbusmenu phonon
+  propagatedBuildInputs = [
+    kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
  ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
@ -4,10 +4,7 @@

 kdeFramework {
  name = "knotifyconfig";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig phonon ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
@ -10,14 +10,11 @@

 kdeFramework {
  name = "kpackage";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
  postInstall = ''
    wrapQtProgram "$out/bin/kpackagetool5"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
@ -5,13 +5,10 @@

 kdeFramework {
  name = "kparts";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
-    kservice kwidgetsaddons
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
+    kservice ktextwidgets kwidgetsaddons kxmlgui
  ];
-  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
@ -4,12 +4,9 @@

 kdeFramework {
  name = "kpeople";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kitemviews kservice kwidgetsaddons
+  propagatedBuildInputs = [
+    kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
  ];
-  propagatedBuildInputs = [ ki18n qtdeclarative ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
@ -4,8 +4,6 @@

 kdeFramework {
  name = "kplotting";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
@ -2,9 +2,7 @@

 kdeFramework {
  name = "kpty";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
@ -5,10 +5,10 @@

 kdeFramework {
  name = "kross";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
-  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [
+    kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
+    qtscript
+  ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
@ -5,12 +5,10 @@

 kdeFramework {
  name = "krunner";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kservice qtquick1 solid threadweaver
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kio kservice plasma-framework qtquick1 solid
+    threadweaver
  ];
-  propagatedBuildInputs = [ ki18n kio plasma-framework ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
@ -1,25 +0,0 @@
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:28:57 -0500
-Subject: [PATCH 1/2] qdiriterator follow symlinks
-
---
- src/sycoca/kbuildsycoca.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
-index 1deae14..250baa8 100644
--- a/src/sycoca/kbuildsycoca.cpp
-+++ b/src/sycoca/kbuildsycoca.cpp
-@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
-            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
-- 
-2.5.2
-
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
@ -1,25 +0,0 @@
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:31:29 -0500
-Subject: [PATCH 2/2] no canonicalize path
-
---
- src/sycoca/vfolder_menu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
-index d3e31c3..d15d743 100644
--- a/src/sycoca/vfolder_menu.cpp
-+++ b/src/sycoca/vfolder_menu.cpp
-@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
-        QString resolved = QDir(dir).canonicalPath();
-+      QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
-- 
-2.5.2
-
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
@ -1,18 +1,12 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcoreaddons
 , kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
 }:

 kdeFramework {
  name = "kservice";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  propagatedNativeBuildInputs = [ extra-cmake-modules ];
  nativeBuildInputs = [ kdoctools ];
-  buildInputs = [ kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    ./0002-no-canonicalize-path.patch
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch
@ -0,0 +1,25 @@
+Index: kservice-5.21.0/src/sycoca/ksycocautils.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/ksycocautils.cpp
+++ kservice-5.21.0/src/sycoca/ksycocautils.cpp
+@@ -24,9 +24,10 @@
+ 
+ void KSycocaUtilsPrivate::read(QDataStream &s, QString &str)
+ {
+    const qint32 bufferSize = 65528;
+     quint32 bytes;
+     s >> bytes;                          // read size of string
+-    if (bytes > 8192) {                  // null string or too big
+    if (bytes > bufferSize) {                  // null string or too big
+         if (bytes != 0xffffffff) {
+             KSycoca::flagError();
+         }
+@@ -35,7 +36,7 @@ void KSycocaUtilsPrivate::read(QDataStre
+         int bt = bytes / 2;
+         str.resize(bt);
+         QChar *ch = str.data();
+-        char t[8192];
+        char t[bufferSize];
+         char *b = t;
+         s.readRawData(b, bytes);
+         while (bt--) {
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch
@ -0,0 +1,13 @@
+Index: kservice-5.21.0/src/sycoca/vfolder_menu.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/vfolder_menu.cpp
+++ kservice-5.21.0/src/sycoca/vfolder_menu.cpp
+@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
+      QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch
@ -0,0 +1,13 @@
+Index: kservice-5.21.0/src/sycoca/kbuildsycoca.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/kbuildsycoca.cpp
+++ kservice-5.21.0/src/sycoca/kbuildsycoca.cpp
+@@ -203,7 +203,7 @@ bool KBuildSycoca::build()
+         QSet<QString> relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/series
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/series
@ -0,0 +1,3 @@
+qdiriterator-follow-symlinks.patch
+no-canonicalize-path.patch
+ksycoca-buffer-size.patch
--- a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
@ -8,15 +8,11 @@

 kdeFramework {
  name = "ktexteditor";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts
-    libgit2
-    qtscript qtxmlpatterns
+  propagatedBuildInputs = [
+    karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
+    qtxmlpatterns sonnet
  ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
@ -5,12 +5,10 @@

 kdeFramework {
  name = "ktextwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice
+  propagatedBuildInputs = [
+    kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
+    sonnet
  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
@ -2,9 +2,7 @@

 kdeFramework {
  name = "kunitconversion";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
  propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
@ -5,17 +5,14 @@

 kdeFramework {
  name = "kwallet";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    knotifications kservice kwidgetsaddons libgcrypt
+  propagatedBuildInputs = [
+    kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
+    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt
  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
  postInstall = ''
    wrapQtProgram "$out/bin/kwalletd5"
    wrapQtProgram "$out/bin/kwallet-query"
  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
@ -4,8 +4,6 @@

 kdeFramework {
  name = "kwidgetsaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
@ -5,9 +5,7 @@

 kdeFramework {
  name = "kwindowsystem";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtx11extras ];
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
@ -5,14 +5,10 @@

 kdeFramework {
  name = "kxmlgui";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    attica kconfig kiconthemes kitemviews ktextwidgets
-  ];
  propagatedBuildInputs = [
-    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
+    attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews
+    ktextwidgets kwindowsystem sonnet
  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
@ -2,9 +2,7 @@

 kdeFramework {
  name = "kxmlrpcclient";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
@ -5,9 +5,7 @@

 kdeFramework {
  name = "modemmanager-qt";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
  propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
@ -5,9 +5,7 @@

 kdeFramework {
  name = "networkmanager-qt";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
  nativeBuildInputs = [ extra-cmake-modules ];
  propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
--- a/Show More
+++ b/Show More