Merge branch 'kde-5' into staging

nixos/modules/services/networking/networkmanager.nix

···
       # 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;
       };
 

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

···
 
         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.
···
       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) ];
 

pkgs/desktops/gnome-2/platform/GConf/default.nix

···
     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

pkgs/desktops/gnome-2/platform/ORBit2/default.nix

···
     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 ];
 

pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix

···
     sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs =
     [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
       intltool gnome_mime_data avahi acl

pkgs/desktops/gnome-2/platform/libbonobo/default.nix

···
     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";
 

pkgs/desktops/gnome-2/platform/libglade/default.nix

···
 
 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 ];

pkgs/desktops/gnome-2/platform/libgnome/default.nix

···
     sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
   };
 
+  outputs = [ "dev" "out" ];
+
   patches = [ ./new-glib.patch ];
 
   nativeBuildInputs = [ pkgconfig ];

pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix

···
     sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ libglade ];
   nativeBuildInputs = [ pkgconfig intltool ];
   propagatedBuildInputs = [ libart_lgpl gtk ];

pkgs/desktops/kde-5/applications-16.04/ark.nix

···
     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" \

pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix

···
 
 kdeApp {
   name = "baloo-widgets";
+  meta = {
+    license = [ lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kconfig
-    kservice
-  ];
   propagatedBuildInputs = [
-    baloo
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
+    baloo kconfig kservice kdelibs4support kfilemetadata ki18n kio
   ];
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix

···
 
 kdeApp {
   name = "dolphin-plugins";
+  meta = {
+    license = [ lib.licenses.gpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-  ];
-  buildInputs = [
-    kxmlgui
-    dolphin
   ];
   propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kio
+    kdelibs4support ki18n kio kxmlgui dolphin
   ];
-  meta = {
-    license = [ lib.licenses.gpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/dolphin.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix

···
 
 kdeApp {
   name = "ffmpegthumbs";
+  meta = {
+    license = with lib.licenses; [ gpl2 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     ffmpeg
     kio
   ];
-  meta = {
-    license = with lib.licenses; [ gpl2 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/filelight.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix

···
 
 kdeApp {
   name = "gpgmepp";
+  meta = {
+    license = with lib.licenses; [ lgpl21 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    boost
-    gpgme
+  propagatedBuildInputs = [
+    boost gpgme
   ];
-  meta = {
-    license = with lib.licenses; [ lgpl21 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/gwenview.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/kate.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/kcalc.nix

···
 
 kdeApp {
   name = "kcalc";
-
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = [ lib.maintainers.fridh ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
   ];
-
-  buildInputs = [
-    gmp
-    kconfig
-    kconfigwidgets
-    kguiaddons
-    kinit
-    knotifications
+  propagatedBuildInputs = [
+    gmp kconfig kconfigwidgets kguiaddons kinit knotifications
   ];
-
   postInstall = ''
     wrapQtProgram "$out/bin/kcalc"
   '';
-
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ lib.maintainers.fridh ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix

···
 
 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 ];
 }

pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix

···
 
 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
+  ];
 }

pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix

···
 
 kdeApp {
   name = "kdenetwork-filesharing";
+  meta = {
+    license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kio
-    kwidgetsaddons
-    samba
+  propagatedBuildInputs = [
+    kcoreaddons ki18n kio kwidgetsaddons samba
   ];
-  meta = {
-    license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/kio-extras.nix

···
     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

pkgs/desktops/kde-5/applications-16.04/konsole.nix

···
 
 kdeApp {
   name = "konsole";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   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
+    extra-cmake-modules kdoctools makeQtWrapper
   ];
   propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kwindowsystem
+    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"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix

···
 
 kdeApp {
   name = "libkdcraw";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     libraw
   ];
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix

···
 
 kdeApp {
   name = "libkexiv2";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     exiv2
   ];
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/libkipi.nix

···
 
 kdeApp {
   name = "libkipi";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     kconfig ki18n kservice kxmlgui
   ];
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/print-manager.nix

···
 
 kdeApp {
   name = "print-manager";
+  meta = {
+    license = [ lib.licenses.gpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    cups
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kiconthemes
-    kcmutils
-    knotifications
-    kwidgetsaddons
-    kitemviews
-  ];
   propagatedBuildInputs = [
-    ki18n
-    kio
-    kwindowsystem
-    plasma-framework
+    cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
+    kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
     qtdeclarative
   ];
-  meta = {
-    license = [ lib.licenses.gpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/applications-16.04/spectacle.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/baloo.nix

···
 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"

pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix

···
 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"

pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix

···
 
 kdeFramework {
   name = "breeze-icons";
+  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtsvg ];
+  propagatedBuildInputs = [ qtsvg ];
 }

pkgs/desktops/kde-5/frameworks-5.21/default.nix

···
     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 {};

pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh

···
         "kconf_update" \
         "kservices5" \
         "kservicetypes5" \
-        "kxmlgui5" \
         "knotifications5" \
-        "icons" \
-        "sounds" \
-        "templates" \
-        "wallpapers" \
         "applications" \
         "desktop-directories" \
         "mime" \
···
     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

pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix

···
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ boost kactivities kconfig ];
+  propagatedBuildInputs = [ boost kactivities kconfig ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix

···
 
 kdeFramework {
   name = "kapidox";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/karchive.nix

···
 
 kdeFramework {
   name = "karchive";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix

···
 
 kdeFramework {
   name = "kcompletion";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kwidgetsaddons ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix

···
 
 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 ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kded.nix

···
 
 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 ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix

···
-{ 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 ];
-  };
-}

pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix

···
 
 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 ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix

···
 
 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
+  ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix

···
 
 kdeFramework {
   name = "kdnssd";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ avahi ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix

···
 
 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 ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix

···
-{ 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 ];
-  };
-}

pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix

···
 
 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
+  ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix

···
 
 kdeFramework {
   name = "kguiaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtx11extras ];
 }

pkgs/desktops/kde-5/frameworks-5.21/khtml.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix

···
 
 kdeFramework {
   name = "kidletime";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtbase qtx11extras ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix

···
 
 kdeFramework {
   name = "kimageformats";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix

···
 , 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix

···
 
 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"
···
     wrapQtProgram "$out/bin/kmailservice5"
     wrapQtProgram "$out/bin/protocoltojson"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix

···
 
 kdeFramework {
   name = "kitemmodels";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix

···
 
 kdeFramework {
   name = "kitemviews";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix

···
 
 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 ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kjs.nix

···
 
 kdeFramework {
   name = "kjs";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   postInstall = ''
     wrapQtProgram "$out/bin/kjs5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix

···
 
 kdeFramework {
   name = "kmediaplayer";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kparts kxmlgui ];
 }

pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix

···
 
 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 ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kparts.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix

···
 
 kdeFramework {
   name = "kplotting";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kpty.nix

···
 
 kdeFramework {
   name = "kpty";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kross.nix

···
 
 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
+  ];
 }

pkgs/desktops/kde-5/frameworks-5.21/krunner.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch

···
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <[e-mail]>
-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
-

pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch

···
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <[e-mail]>
-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
-

pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix

···
-{ 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);
 }

pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch

···
+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--) {

pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch

···
+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;
+         }

pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch

···
+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...

pkgs/desktops/kde-5/frameworks-5.21/kservice/series

···
+qdiriterator-follow-symlinks.patch
+no-canonicalize-path.patch
+ksycoca-buffer-size.patch

pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix

···
 
 kdeFramework {
   name = "kunitconversion";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix

···
 
 kdeFramework {
   name = "kwidgetsaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix

···
 
 kdeFramework {
   name = "kwindowsystem";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtx11extras ];
 }

pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix

···
 
 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 ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix

···
 
 kdeFramework {
   name = "kxmlrpcclient";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix

···
 
 kdeFramework {
   name = "modemmanager-qt";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix

···
 
 kdeFramework {
   name = "networkmanager-qt";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix

···
 
 kdeFramework {
   name = "oxygen-icons5";
-  nativeBuildInputs = [ extra-cmake-modules ];
   meta = {
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  outputs = [ "out" ];
+  nativeBuildInputs = [ extra-cmake-modules ];
 }

pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix

···
 
 kdeFramework {
   name = "plasma-framework";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    kiconthemes knotifications kxmlgui qtscript
-  ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
-    qtx11extras
+    kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
+    kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
+    kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/plasmapkg2"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/solid.nix

···
 
 kdeFramework {
   name = "solid";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtdeclarative ];
   postInstall = ''
     wrapQtProgram "$out/bin/solid-hardware5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix

···
 
 kdeFramework {
   name = "sonnet";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ hunspell ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix

···
 kdeFramework {
   name = "threadweaver";
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
 }

pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix

···
   nativeBuildInputs = [
     extra-cmake-modules makeQtWrapper shared_mime_info
   ];
-  buildInputs = [
-    kcoreaddons kdbusaddons kded kiconthemes knotifications
-    kwidgetsaddons
-  ];
   propagatedBuildInputs = [
-    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
+    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
+    kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
   propagatedUserEnvPkgs = [ bluez-qt ];
   postInstall = ''

pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix

···
     extra-cmake-modules
     makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
-  ];
   propagatedBuildInputs = [
     frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras
+    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
   ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
   postInstall = ''

pkgs/desktops/kde-5/plasma-5.6/default.nix

···
     plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
     plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {};
-    plasma-workspace = callPackage ./plasma-workspace.nix {};
+    plasma-workspace = callPackage ./plasma-workspace {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
     polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
     powerdevil = callPackage ./powerdevil.nix {};

pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix

···
 plasmaPackage {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcmutils kconfig kdesu kiconthemes
-  ];
   propagatedBuildInputs = [
-    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
+    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras kcmutils kconfig kdesu
+    kiconthemes
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kmimetypefinder5"

pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix

···
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
+  propagatedBuildInputs = [
+    ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
   ];
-  propagatedBuildInputs = [ ki18n kio ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix

···
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    ibus kconfig kconfigwidgets kcoreaddons kcmutils
-    knewstuff kservice kunitconversion
-  ];
   propagatedBuildInputs = [
     kdelibs4support kio kross krunner plasma-framework plasma-workspace
-    qtdeclarative qtx11extras
+    qtdeclarative qtx11extras ibus kconfig kconfigwidgets kcoreaddons kcmutils
+    knewstuff kservice kunitconversion
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix

···
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
+  propagatedBuildInputs = [
+    kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit kcmutils
+    kservice
   ];
-  propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
   postInstall = ''
     wrapQtProgram "$out/bin/khelpcenter"
   '';

pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix

···
 plasmaPackage {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcmutils kdbusaddons kxmlgui
-  ];
   propagatedBuildInputs = [
-    kdelibs4support kglobalaccel ki18n kio plasma-framework
-    plasma-workspace qtx11extras
+    kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
+    qtx11extras kcmutils kdbusaddons kxmlgui
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix

···
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons kiconthemes kpackage kservice kwidgetsaddons
-    kxmlgui libraw1394 pciutils solid
+  propagatedBuildInputs = [
+    kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig
+    kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice
+    kwidgetsaddons kxmlgui libraw1394 pciutils solid
   ];
-  propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
   postInstall = ''
     wrapQtProgram "$out/bin/kinfocenter"
   '';

pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix

···
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kxmlgui kdbusaddons kiconthemes
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes
   ];
-  propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
   postInstall = ''
     wrapQtProgram "$out/bin/kmenuedit"
   '';

pkgs/desktops/kde-5/plasma-5.6/kscreen.nix

···
     extra-cmake-modules
     makeQtWrapper
   ];
-  buildInputs = [
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kwidgetsaddons
-    kxmlgui
-  ];
   propagatedBuildInputs = [
-    kglobalaccel
-    ki18n
-    libkscreen
-    qtdeclarative
-    qtgraphicaleffects
+    kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
+    kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kscreen-console"

pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix

···
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kcmutils kcrash kdelibs4support kglobalaccel kidletime kwayland
-    libXcursor pam wayland
-  ];
   propagatedBuildInputs = [
-    kdeclarative plasma-framework qtdeclarative
+    kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support
+    kglobalaccel kidletime kwayland libXcursor pam wayland
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix

···
 plasmaPackage {
   name = "ksshaskpass";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
   postInstall = ''
     wrapQtProgram "$out/bin/ksshaskpass"
   '';

pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix

···
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
+    kdelibs4support ki18n
   ];
-  propagatedBuildInputs = [ kdelibs4support ki18n ];
   postInstall = ''
     wrapQtProgram "$out/bin/ksysguardd"
   '';

pkgs/desktops/kde-5/plasma-5.6/kwayland.nix

···
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     wayland
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix

···
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
-    kcrash kdecoration kiconthemes kidletime kinit knewstuff knotifications
-    kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
-    libSM qtscript udev wayland xcb-util-cursor
-  ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker
-    kwindowsystem plasma-framework qtdeclarative qtmultimedia qtx11extras
+    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem
+    plasma-framework qtdeclarative qtmultimedia qtx11extras epoxy kcompletion
+    kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes
+    kidletime kinit knewstuff knotifications kpackage kservice kwayland
+    kwidgetsaddons kxmlgui libinput libICE libSM qtscript udev wayland
+    xcb-util-cursor
   ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];

pkgs/desktops/kde-5/plasma-5.6/kwrited.nix

···
 plasmaPackage {
   name = "kwrited";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
 }

pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix

···
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kwayland libXrandr
-  ];
   propagatedBuildInputs = [
-    qtx11extras
+    kwayland libXrandr qtx11extras
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix

···
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kservice
-    kwidgetsaddons qtscript qtwebkit
-  ];
   propagatedBuildInputs = [
-    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework
-    qtx11extras
+    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras
+    kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript
+    qtwebkit
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/milou.nix

···
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    qtscript kcoreaddons kservice
-  ];
   propagatedBuildInputs = [
-    kdeclarative ki18n krunner plasma-framework qtdeclarative
+    kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
+    kcoreaddons kservice
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/oxygen.nix

···
   nativeBuildInputs = [
     extra-cmake-modules makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
-    kservice kcompletion
+  propagatedBuildInputs = [
+    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion
+    frameworkintegration ki18n kwindowsystem qtx11extras
   ];
-  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
   postInstall = ''
     wrapQtProgram "$out/bin/oxygen-demo5"
     wrapQtProgram "$out/bin/oxygen-settings5"

pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix

···
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    attica
-    boost
-    fontconfig
-    kcmutils
-    kdbusaddons
-    kded
-    kitemmodels
-    knewstuff
-    knotifications
-    knotifyconfig
-    kwallet
-    libcanberra_kde
-    libXcursor
-    libpulseaudio
-    libXft
-    libxkbfile
-    phonon
-    qtsvg
-    xf86inputevdev
-    xf86inputsynaptics
-    xkeyboard_config
-    xinput
-  ];
   propagatedBuildInputs = [
-    baloo
-    kactivities
-    kauth
-    kdeclarative
-    kdelibs4support
-    kemoticons
-    kglobalaccel
-    ki18n
-    kpeople
-    krunner
-    kwin
-    plasma-framework
-    plasma-workspace
-    qtdeclarative
-    qtquick1
-    qtquickcontrols
-    qtx11extras
+    attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
+    knotifications knotifyconfig kwallet libcanberra_kde libXcursor
+    libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
+    xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth
+    kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner
+    kwin plasma-framework plasma-workspace qtdeclarative qtquick1
+    qtquickcontrols qtx11extras
   ];
   patches = [
     ./0001-qt-5.5-QML-import-paths.patch

pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix

···
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kconfig kcoreaddons kguiaddons kservice
-    qtdeclarative qtmultimedia taglib
-  ];
   propagatedBuildInputs = [
-    baloo kactivities kdeclarative kfilemetadata ki18n kio
-    plasma-framework
+    baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework
+    kconfig kcoreaddons kguiaddons kservice qtdeclarative qtmultimedia taglib
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix

···
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kinit kitemviews knotifications kservice kwallet kwidgetsaddons
-    kxmlgui mobile_broadband_provider_info modemmanager-qt
-    networkmanager-qt openconnect qca-qt5 solid
-  ];
   propagatedBuildInputs = [
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
-    qtdeclarative
+    qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
+    mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
+    qca-qt5 solid
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kde5-nm-connection-editor"

pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix

···
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    glib kconfigwidgets kcoreaddons libpulseaudio
-  ];
   propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n plasma-framework
+    glib kconfigwidgets kcoreaddons libpulseaudio kdeclarative kglobalaccel
+    ki18n plasma-framework
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix

···
-{ plasmaPackage, lib
-, extra-cmake-modules, kdoctools
-, baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative
-, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime
-, kjsembed, knewstuff, knotifyconfig, kpackage, krunner
-, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient
-, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt
-, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland
-, libksysguard, kconfig, solid, qtquickcontrols
-}:
-
-plasmaPackage {
-  name = "plasma-workspace";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit
-    kjsembed knewstuff knotifyconfig kpackage
-    ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM
-    libXcursor networkmanager-qt pam phonon qtscript
-    wayland
-  ];
-  propagatedBuildInputs = [
-    baloo kactivities kdeclarative kdelibs4support kglobalaccel
-    kidletime krunner ktexteditor kwin libkscreen libksysguard
-    plasma-framework qtquick1 qtquickcontrols qtx11extras solid
-  ];
-
-  postPatch = ''
-    substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
-  '';
-
-  postInstall = ''
-    rm "$out/bin/startkde"
-    rm "$out/bin/startplasmacompositor"
-    rm "$out/lib/libexec/startplasma"
-    rm -r "$out/share/wayland-sessions"
-  '';
-}

pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix

···
+{ plasmaPackage, lib, copyPathsToStore
+, extra-cmake-modules, kdoctools
+, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative
+, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime, kjsembed, knewstuff
+, knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland
+, kwin, kxmlrpcclient, libdbusmenu, libkscreen, libksysguard, libSM, libXcursor
+, networkmanager-qt, pam, phonon, plasma-framework, qtquick1, qtquickcontrols
+, qtscript, qtx11extras, solid, wayland
+}:
+
+plasmaPackage {
+  name = "plasma-workspace";
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
+    kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff
+    knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
+    kwin kxmlrpcclient libdbusmenu libkscreen libksysguard libSM libXcursor
+    networkmanager-qt pam phonon plasma-framework qtquick1 qtquickcontrols
+    qtscript qtx11extras solid wayland
+  ];
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  postPatch = ''
+    substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
+        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+  '';
+
+  postInstall = ''
+    rm "$out/bin/startkde"
+    rm "$out/bin/startplasmacompositor"
+    rm "$out/lib/libexec/startplasma"
+    rm -r "$out/share/wayland-sessions"
+  '';
+
+  preFixup = ''
+    wrapQtProgram $out/bin/kcheckrunning
+    wrapQtProgram $out/bin/kcminit
+    wrapQtProgram $out/bin/kcminit_startup
+    wrapQtProgram $out/bin/kdostartupconfig5
+    wrapQtProgram $out/bin/klipper
+    wrapQtProgram $out/bin/krunner
+    wrapQtProgram $out/bin/ksmserver
+    wrapQtProgram $out/bin/ksplashqml
+    wrapQtProgram $out/bin/kstartupconfig5
+    wrapQtProgram $out/bin/kuiserver5
+    wrapQtProgram $out/bin/plasmashell
+    wrapQtProgram $out/bin/plasmawindowed
+    wrapQtProgram $out/bin/systemmonitor
+    wrapQtProgram $out/bin/xembedsniproxy
+  '';
+}

pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch

···
+Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml
++++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
+@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1
+ 
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: analogclock
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.plasma.workspace.components 2.0
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: batteryItem
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as Components
+ import org.kde.plasma.workspace.components 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ MouseArea {
+     id: root
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
+ import org.kde.plasma.components 2.0 as Components
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ FocusScope {
+     id: dialog
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: batterymonitor
+Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/lock_logout/contents/ui/lockout.qml
++++ plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0
+ import org.kde.kquickcontrolsaddons 2.0
+-import "data.js" as Data
++import "../code/data.js" as Data
+ 
+ Flow {
+     id: lockout
+Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml
++++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
+@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
+ 
+ import org.kde.plasma.private.notifications 1.0
+ 
+-import "uiproperties.js" as UiProperties
++import "../code/uiproperties.js" as UiProperties
+ 
+ MouseEventListener {
+     id: notificationsApplet
+Index: plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/systemtray/package/contents/ui/main.qml
++++ plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
+ // import org.kde.plasma.extras 2.0 as PlasmaExtras
+ 
+ import org.kde.private.systemtray 2.0 as SystemTray
+-import "Layout.js" as LayoutManager
++import "../code/Layout.js" as LayoutManager
+ 
+ Item {
+     id: root

pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series

···
+qml-import-path.patch

pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch

···
+Index: plasma-workspace-5.5.5/startkde/startkde.cmake
+===================================================================
+--- plasma-workspace-5.5.5.orig/startkde/startkde.cmake
++++ plasma-workspace-5.5.5/startkde/startkde.cmake
+@@ -1,8 +1,36 @@
+-#!/bin/sh
++#!@bash@
+ #
+ #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #
+ 
++set -x
++
++# The KDE icon cache is supposed to update itself
++# automatically, but it uses the timestamp on the icon
++# theme directory as a trigger.  Since in Nix the
++# timestamp is always the same, this doesn't work.  So as
++# a workaround, nuke the icon cache on login.  This isn't
++# perfect, since it may require logging out after
++# installing new applications to update the cache.
++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
++rm -fv $HOME/.cache/icon-cache.kcache
++
++# Qt writes a weird ‘libraryPath’ line to
++# ~/.config/Trolltech.conf that causes the KDE plugin
++# paths of previous KDE invocations to be searched.
++# Obviously using mismatching KDE libraries is potentially
++# disastrous, so here we nuke references to the Nix store
++# in Trolltech.conf.  A better solution would be to stop
++# Qt from doing this wackiness in the first place.
++if [ -e $HOME/.config/Trolltech.conf ]; then
++    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
++fi
++
++# (NixOS) We run kbuildsycoca5 before starting the user session because things
++# may be missing or moved if they have run nixos-rebuild and it may not be
++# possible for them to start Konsole to run it manually!
++@kbuildsycoca5@
++
+ if test "x$1" = x--failsafe; then
+     KDE_FAILSAFE=1 # General failsafe flag
+     KWIN_COMPOSE=N # Disable KWin's compositing
+@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+-  qbindir=`qtpaths --binaries-dir`
+-  qdbus=$qbindir/qdbus
+-  case $PATH in
+-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+-    *) PATH=$bindir:$PATH; export PATH;;
+-  esac
+-else
+-  qdbus=qdbus
+-fi
+-
+ # Check if a KDE session already is running and whether it's possible to connect to X
+-kcheckrunning
++@kcheckrunning@
+ kcheckrunning_result=$?
+ if test $kcheckrunning_result -eq 0 ; then
+-	echo "KDE seems to be already running on this display."
+-	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
++  echo "KDE seems to be already running on this display."
++  @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
+ 	exit 1
+ elif test $kcheckrunning_result -eq 2 ; then
+ 	echo "\$DISPLAY is not set or cannot connect to the X server."
+-        exit 1
++  exit 1
+ fi
+ 
+ # Boot sequence:
+@@ -57,13 +72,8 @@ fi
+ # * Then ksmserver is started which takes control of the rest of the startup sequence
+ 
+ # We need to create config folder so we can write startupconfigkeys
+-if [  ${XDG_CONFIG_HOME} ]; then
+-  configDir=$XDG_CONFIG_HOME;
+-else
+-  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+-fi
+-
+-mkdir -p $configDir
++configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
++mkdir -p "$configDir"
+ 
+ #This is basically setting defaults so we can use them with kstartupconfig5
+ cat >$configDir/startupconfigkeys <<EOF
+@@ -102,42 +112,10 @@ XftSubPixel=none
+ EOF
+ }
+ 
+-# Make sure the Oxygen font is installed
+-# This is necessary for setups where CMAKE_INSTALL_PREFIX
+-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
+-# $XDG_DATA_HOME for fonts. In this case, we symlink the
+-# Oxygen font under ${XDG_DATA_HOME} and make it known to
+-# fontconfig
+-
+-usr_share="/usr/share"
+-install_share="@KDE_INSTALL_FULL_DATADIR@"
+-
+-if [ ! $install_share = $usr_share ]; then
+-
+-    if [ ${XDG_DATA_HOME} ]; then
+-        fontsDir="${XDG_DATA_HOME}/fonts"
+-    else
+-        fontsDir="${HOME}/.fonts"
+-    fi
+-
+-    test -d $fontsDir || {
+-        mkdir -p $fontsDir
+-    }
+-
+-    oxygenDir=$fontsDir/oxygen
+-    prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
+-
+-    # if the oxygen dir doesn't exist, create a symlink to be sure that the
+-    # Oxygen font is available to the user
+-    test -d $oxygenDir || test -d $prefixDir && {
+-        test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
+-    }
+-fi
+-
+-kstartupconfig5
++@out@/bin/kstartupconfig5
+ returncode=$?
+ if test $returncode -ne 0; then
+-    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
++    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
+     exit 1
+ fi
+ [ -r $configDir/startupconfig ] && . $configDir/startupconfig
+@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor
+     export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
+ fi
+ 
++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":")
++export XCURSOR_PATH
++
+ # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+-    @EXPORT_XCURSOR_PATH@
+ 
+     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+     if test $? -eq 10; then
+@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem
+     fi
+ fi
+ 
+-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+-    xrdb -quiet -merge -nocpp <<EOF
+-Xft.dpi: $kcmfonts_general_forcefontdpi
+-EOF
+-fi
++# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
++# from some users that they're confused and don't know what to do. This is
++# especially necessary on slow machines, where starting KDE takes one or two
++# minutes until anything appears on the screen.
++#
++# If the user has overwritten fonts, the cursor font may be different now
++# so don't move this up.
++#
++@xsetroot@ -cursor_name left_ptr
+ 
+ dl=$DESKTOP_LOCKED
+ unset DESKTOP_LOCKED # Don't want it in the environment
+ 
++# Make sure that D-Bus is running
++# D-Bus autolaunch is broken
++if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
++    eval `@dbus-launch@ --sh-syntax --exit-with-session`
++fi
++if @qdbus@ >/dev/null 2>/dev/null; then
++    : # ok
++else
++    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
++    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
++    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
++    exit 1
++fi
++
+ ksplash_pid=
+ if test -z "$dl"; then
+   # the splashscreen and progress indicator
+   case "$ksplashrc_ksplash_engine" in
+     KSplashQML)
+-      ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
++      ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+       ;;
+     None)
+       ;;
+@@ -201,8 +199,7 @@ fi
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-# TODO: Use GenericConfigLocation once we depend on Qt 5.4
+-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
++scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g')
+ 
+ # Add /env/ to the directory to locate the scripts to be sourced
+ for prefix in `echo $scriptpath`; do
+@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override
+ usr_fdir=$HOME/.fonts
+ 
+ if test -n "$KDEDIRS"; then
+-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
++  kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'`
+   sys_odir=$kdedirs_first/share/fonts/override
+   sys_fdir=$kdedirs_first/share/fonts
+ else
+@@ -245,23 +242,13 @@ fi
+ # add the user's dirs to the font path, as they might simply have been made
+ # read-only by the administrator, for whatever reason.
+ 
+-test -d "$sys_odir" && xset +fp "$sys_odir"
+-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
+-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
+-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
++test -d "$sys_odir" && @xset@ +fp "$sys_odir"
++test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" )
++test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" )
++test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir"
+ 
+ # Ask X11 to rebuild its font list.
+-xset fp rehash
+-
+-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+-# from some users that they're confused and don't know what to do. This is
+-# especially necessary on slow machines, where starting KDE takes one or two
+-# minutes until anything appears on the screen.
+-#
+-# If the user has overwritten fonts, the cursor font may be different now
+-# so don't move this up.
+-#
+-xsetroot -cursor_name left_ptr
++@xset@ fp rehash
+ 
+ # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+ if test -n "$GS_LIB" ; then
+@@ -274,26 +261,6 @@ fi
+ 
+ echo 'startkde: Starting up...'  1>&2
+ 
+-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
+-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
+-# /usr/local.
+-if test -z "$XDG_DATA_DIRS"; then
+-    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
+-fi
+-export XDG_DATA_DIRS
+-
+-# Make sure that D-Bus is running
+-if $qdbus >/dev/null 2>/dev/null; then
+-    : # ok
+-else
+-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+-    exit 1
+-fi
+-
+-
+ # Mark that full KDE session is running (e.g. Konqueror preloading works only
+ # with full KDE running). The KDE_FULL_SESSION property can be detected by
+ # any X client connected to the same X session, even if not launched
+@@ -318,11 +285,11 @@ fi
+ #
+ KDE_FULL_SESSION=true
+ export KDE_FULL_SESSION
+-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+ 
+ KDE_SESSION_VERSION=5
+ export KDE_SESSION_VERSION
+-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+ 
+ KDE_SESSION_UID=`id -ru`
+ export KDE_SESSION_UID
+@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP
+ 
+ # At this point all the environment is ready, let's send it to kwalletd if running
+ if test -n "$PAM_KWALLET_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+ fi
+ # ...and also to kwalletd5
+ if test -n "$PAM_KWALLET5_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
+ fi
+ 
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+@@ -349,18 +316,18 @@ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not sync environment to dbus.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not sync environment to dbus."
++  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
+   exit 1
+ fi
+ 
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+ # kdeinit unsets this variable before loading applications.
+-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
+ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
+   exit 1
+ fi
+ 
+@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag
+ # lock now and do the rest of the KDE startup underneath the locker.
+ KSMSERVEROPTIONS=""
+ test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
++@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
+ if test $? -eq 255; then
+   # Startup error
+   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
+ fi
+ 
+-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+ 
+ if test x"$wait_drkonqi"x = x"true"x ; then
+     # wait for remaining drkonqi instances with timeout (in seconds)
+-    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++    wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+     wait_drkonqi_counter=0
+-    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++    while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do
+         sleep 5
+         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+             # ask remaining drkonqis to die in a graceful way
+-            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+-                $qdbus "$address" "/MainApplication" "quit"
++            @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do
++                @qdbus@ "$address" "/MainApplication" "quit"
+             done
+             break
+         fi
+@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...'  1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+ 
+ # Clean up
+-kdeinit5_shutdown
++@kdeinit5_shutdown@
+ 
+ unset KDE_FULL_SESSION
+-xprop -root -remove KDE_FULL_SESSION
++@xprop@ -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-xprop -root -remove KDE_SESSION_VERSION
++@xprop@ -root -remove KDE_SESSION_VERSION
+ unset KDE_SESSION_UID
+ 
+ echo 'startkde: Done.'  1>&2

pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix

···
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kdbusaddons
-    kwidgetsaddons
-    kcoreaddons
-    kcrash
-    kconfig
-    kiconthemes
-    knotifications
-    polkit-qt
+  propagatedBuildInputs = [
+    kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
+    knotifications kwindowsystem polkit-qt
   ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
 }

pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix

···
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kconfig kdbusaddons knotifyconfig solid udev
-  ];
   propagatedBuildInputs = [
-    kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime
-    kwayland libkscreen plasma-workspace qtx11extras
+    kconfig kdbusaddons knotifyconfig solid udev kactivities kauth
+    kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
+    plasma-workspace qtx11extras
   ];
 }

pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh

···
-addToSearchPath XDG_DATA_DIRS @out@/share

pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix

···
     makeQtWrapper
   ];
   buildInputs = [
-    kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
-    kconfig
+  ];
+  propagatedBuildInputs = [
+    khtml ki18n kio kwindowsystem kitemviews kcmutils kservice kiconthemes
+    kxmlgui kdbusaddons kconfig
   ];
-  propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
   postInstall = ''
     wrapQtProgram "$out/bin/systemsettings5"
   '';

pkgs/development/libraries/libgnome-keyring/default.nix

···
     sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n";
   };
 
+  outputs = [ "dev" "out" ];
+
   propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 

pkgs/development/libraries/poppler/default.nix

···
 
   nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
 
+  NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
+
   configureFlags = with lib;
     [
       "--enable-xpdf-headers"
       "--enable-libcurl"
       "--enable-zlib"
+      "--enable-build-type=release"
     ]
     ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" ]
     ++ optional (!utils) "--disable-utils";

pkgs/development/libraries/qt-5/5.5/default.nix

···
       nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
-      dontFixLibtool = args.dontFixLibtool or true;
 
       outputs = args.outputs or [ "dev" "out" ];
       setOutputFlags = args.setOutputFlags or false;

pkgs/development/libraries/qt-5/5.5/qmake-hook.sh

···
     # The destination directory must exist or moveToOutput will do nothing
     mkdir -p "${!outputDev}/share"
     moveToOutput "share/doc" "${!outputDev}"
+
+    # Move libtool archives and qmake project files to $dev/lib
+    if [ "z${!outputLib}" != "z${!outputDev}" ]; then
+        pushd "${!outputLib}"
+        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \
+            while read -r -d $'\0' file; do
+                mkdir -p "${!outputDev}/$(dirname "$file")"
+                mv "${!outputLib}/$file" "${!outputDev}/$file"
+            done
+        popd
+    fi
 }
 
 qmakeConfigurePhase() {

pkgs/development/libraries/qt-5/5.5/qtbase/default.nix

···
 , zlib, libjpeg, libpng, libtiff, sqlite, icu
 
 , coreutils, bison, flex, gdb, gperf, lndir, ruby
-, python, perl, pkgconfig
+, patchelf, perl, pkgconfig, python
 
 # optional dependencies
 , cups ? null
···
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
-, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk
+, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk
 , decryptSslTraffic ? false
 }:
 
···
   inherit (srcs.qt5) version;
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
 
+  # Search path for Gtk plugin
+  gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ];
+
   dontInvalidateBacking = fetchurl {
     url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
     name = "qtbug-48321-dont-invalidate-backing-store.patch";
···
 
   sourceRoot = "qt-everywhere-opensource-src-${version}";
 
-  outputs = [ "dev" "out" ];
+  outputs = [ "dev" "out" "gtk" ];
 
   postUnpack = ''
     mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
···
 
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch
     ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
     ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
···
         qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
         --replace "@libX11@" "${libX11.out}"
     ''
-    + lib.optionalString gtkStyle ''
-      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}"
-      substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
-        --replace "@gtk@" "${gtk.out}" \
-        --replace "@gnome_vfs@" "${gnome_vfs.out}" \
-        --replace "@libgnomeui@" "${libgnomeui.out}" \
-        --replace "@gconf@" "${GConf.out}"
-    ''
     + lib.optionalString mesaSupported ''
       substituteInPlace \
         qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
···
         --replace "@mesa_lib@" "${mesa.out}" \
         --replace "@mesa_inc@" "${mesa.dev}"
     '';
+
 
   setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    _multioutQtDevs() {
-        # We cannot simply set these paths in configureFlags because libQtCore retains
-        # references to the paths it was built with.
-        moveToOutput "bin" "$dev"
-        moveToOutput "include" "$dev"
-        moveToOutput "mkspecs" "$dev"
-
-        # The destination directory must exist or moveToOutput will do nothing
-        mkdir -p "$dev/share"
-        moveToOutput "share/doc" "$dev"
-    }
-    preFixupHooks+=(_multioutQtDevs)
-
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \
···
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
+  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
+
+  preFixup = ''
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "$dev"
+    moveToOutput "include" "$dev"
+    moveToOutput "mkspecs" "$dev"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "$dev/share"
+    moveToOutput "share/doc" "$dev"
+
+    # Move libtool archives and qmake projects
+    if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
+        pushd "''${!outputLib}"
+        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+            while read -r file; do
+                mkdir -p "''${!outputDev}/$(dirname "$file")"
+                mv "''${!outputLib}/$file" "''${!outputDev}/$file"
+            done
+        popd
+    fi
+
+    # Move the QGtkStyle plugin to the gtk output
+    mkdir -p "$gtk/lib/qt5/plugins/platformthemes"
+    mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes"
+    rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake"
+
+    # Set RPATH for QGtkStyle plugin
+    qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so"
+    qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")"
+    qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}"
+    patchelf "$qgtk2" \
+        --add-needed libgtk-x11-2.0.so \
+        --add-needed libgnomeui-2.so \
+        --add-needed libgnomevfs-2.so \
+        --add-needed libgconf-2.so \
+        --set-rpath "$qgtk2_RPATH"
+  '';
 
   postFixup =
     ''