Merge branch 'master.upstream' into staging.upstream

nixos/modules/programs/environment.nix

@@ -38,9 +38,7 @@ in
         PERL5LIB = [ "/lib/perl5/site_perl" ];
         KDEDIRS = [ "" ];
         STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
-        QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" "/lib/qt5/plugins" ];
-        QML_IMPORT_PATH = [ "/lib/qt5/imports" ];
-        QML2_IMPORT_PATH = [ "/lib/qt5/qml" ];
+        QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];
         QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
         GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ];

nixos/modules/services/hardware/tlp.nix

@@ -8,7 +8,16 @@ cfg = config.services.tlp;
 
 tlp = pkgs.tlp.override { kmod = config.system.sbin.modprobe; };
 
-confFile = pkgs.writeText "tlp" (builtins.readFile "${tlp}/etc/default/tlp" + cfg.extraConfig);
+# XXX: We can't use writeTextFile + readFile here because it triggers
+# TLP build to get the .drv (even on --dry-run).
+confFile = pkgs.runCommand "tlp"
+  { config = cfg.extraConfig;
+    passAsFile = [ "config" ];
+  }
+  ''
+    cat ${tlp}/etc/default/tlp > $out
+    cat $configPath >> $out
+  '';
 
 in
 

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

@@ -8,38 +8,9 @@ let
   cfg = xcfg.desktopManager.kde5;
   xorg = pkgs.xorg;
 
-  phononBackends = {
-    gstreamer = [
-      pkgs.phonon_backend_gstreamer
-      pkgs.gst_all.gstreamer
-      pkgs.gst_all.gstPluginsBase
-      pkgs.gst_all.gstPluginsGood
-      pkgs.gst_all.gstPluginsUgly
-      pkgs.gst_all.gstPluginsBad
-      pkgs.gst_all.gstFfmpeg # for mp3 playback
-      pkgs.phonon_qt5_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
-    ];
-
-    vlc = [
-      pkgs.phonon_qt5_backend_vlc
-      pkgs.phonon_backend_vlc
-    ];
-  };
-
-  phononBackendPackages = flip concatMap cfg.phononBackends
-    (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
-
   kf5 = pkgs.kf5_stable;
-
-  plasma5 = pkgs.plasma5_stable.override { inherit kf5; };
-
-  kdeApps = pkgs.kdeApps_stable.override { inherit kf5; };
+  plasma5 = pkgs.plasma5_stable;
+  kdeApps = pkgs.kdeApps_stable;
 
 in
 
@@ -53,14 +24,24 @@ in
         description = "Enable the Plasma 5 (KDE 5) desktop environment.";
       };
 
-      phononBackends = mkOption {
-        type = types.listOf types.str;
-        default = ["gstreamer"];
-        example = ["gstreamer" "vlc"];
-        description = ''
-          Phonon backends to use in KDE. Only the VLC and GStreamer backends are
-          available. The GStreamer backend is preferred by upstream.
-        '';
+      phonon = {
+
+        gstreamer = {
+          enable = mkOption {
+            type = types.bool;
+            default = true;
+            description = "Enable the GStreamer Phonon backend (recommended).";
+          };
+        };
+
+        vlc = {
+          enable = mkOption {
+            type = types.bool;
+            default = false;
+            description = "Enable the VLC Phonon backend.";
+          };
+        };
+
       };
 
     };
@@ -88,23 +69,77 @@ in
     };
 
     environment.systemPackages =
-      filter isDerivation (builtins.attrValues plasma5)
-      ++ filter isDerivation (builtins.attrValues kf5)
-      ++ [
+      [
         pkgs.qt4 # qtconfig is the only way to set Qt 4 theme
 
-        kdeApps.kde-baseapps
-        kdeApps.kde-base-artwork
-        kdeApps.kmix
+        kf5.frameworkintegration
+        kf5.kinit
+
+        plasma5.breeze
+        plasma5.kde-cli-tools
+        plasma5.kdeplasma-addons
+        plasma5.kgamma5
+        plasma5.khelpcenter
+        plasma5.khotkeys
+        plasma5.kinfocenter
+        plasma5.kmenuedit
+        plasma5.kscreen
+        plasma5.ksysguard
+        plasma5.kwayland
+        plasma5.kwin
+        plasma5.kwrited
+        plasma5.milou
+        plasma5.oxygen
+        plasma5.polkit-kde-agent
+        plasma5.systemsettings
+
+        plasma5.plasma-desktop
+        plasma5.plasma-workspace
+        plasma5.plasma-workspace-wallpapers
+
+        kdeApps.ark
+        kdeApps.dolphin
+        kdeApps.dolphin-plugins
+        kdeApps.ffmpegthumbs
+        kdeApps.gwenview
+        kdeApps.kate
+        kdeApps.kdegraphics-thumbnailers
         kdeApps.konsole
+        kdeApps.okular
+        kdeApps.print-manager
+
         kdeApps.oxygen-icons
-
-        kdeApps.kde-runtime
-
         pkgs.hicolor_icon_theme
 
+        plasma5.kde-gtk-config
         pkgs.orion # GTK theme, nearly identical to Breeze
-      ] ++ phononBackendPackages;
+      ]
+      ++ lib.optional config.hardware.bluetooth.enable plasma5.bluedevil
+      ++ lib.optional config.networking.networkmanager.enable plasma5.plasma-nm
+      ++ lib.optional config.hardware.pulseaudio.enable plasma5.plasma-pa
+      ++ lib.optional config.powerManagement.enable plasma5.powerdevil
+      ++ lib.optionals cfg.phonon.gstreamer.enable
+        [
+          pkgs.phonon_backend_gstreamer
+          pkgs.gst_all.gstreamer
+          pkgs.gst_all.gstPluginsBase
+          pkgs.gst_all.gstPluginsGood
+          pkgs.gst_all.gstPluginsUgly
+          pkgs.gst_all.gstPluginsBad
+          pkgs.gst_all.gstFfmpeg # for mp3 playback
+          pkgs.phonon_qt5_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
+        ]
+      ++ lib.optionals cfg.phonon.vlc.enable
+        [
+          pkgs.phonon_qt5_backend_vlc
+          pkgs.phonon_backend_vlc
+        ];
 
     environment.pathsToLink = [ "/share" ];
 
@@ -114,7 +149,7 @@ in
     };
 
     environment.profileRelativeEnvVars =
-      mkIf (lib.elem "gstreamer" cfg.phononBackends)
+      mkIf cfg.phonon.gstreamer.enable
       {
         GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
         GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];

pkgs/applications/audio/cantata/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake
 , withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtsvg, qttools
+, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
 
 # I'm unable to make KDE work here, crashes at runtime so I simply
 # make Qt4 the default until someone who wants KDE can figure it out.
@@ -68,6 +68,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
     ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
 
+  nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
+
   unpackPhase = "tar -xvf $src";
   sourceRoot = "${name}";
 
@@ -91,7 +93,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_UDISKS2=ON"
   ];
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString withQt5 ''
     wrapQtProgram "$out/bin/cantata"
   '';
 

pkgs/applications/audio/dfasma/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia }:
+{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, makeQtWrapper }:
 
 let
 
@@ -41,6 +41,8 @@ in stdenv.mkDerivation {
 
   buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
 
+  nativeBuildInputs = [ makeQtWrapper ];
+
   postPatch = ''
     substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
     cp -Rv "${reaperFork.src}"/* external/REAPER

pkgs/applications/audio/sonic-visualiser/default.nix

@@ -2,7 +2,7 @@
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, qtbase, redland
+, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
 , rubberband, serd, sord, vampSDK, fftwFloat
 }:
 
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
       libX11
     ];
 
+  nativeBuildInputs = [ makeQtWrapper ];
+
   buildPhase = ''
     for i in sonic-visualiser svapp svcore svgui;
       do cd $i && qmake -makefile PREFIX=$out && cd ..;

pkgs/applications/display-managers/sddm/default.nix

@@ -1,8 +1,8 @@
-{ stdenv, fetchpatch, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
+{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }:
 
 let
-  version = "0.12.0";
+  version = "0.13.0";
 in
 stdenv.mkDerivation rec {
   name = "sddm-${version}";
@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {
     owner = "sddm";
     repo = "sddm";
     rev = "v${version}";
-    sha256 = "09amr61srvl52nvxlqqgs9fzn33pc2gjv5hc83gxx43x6q2j19gg";
+    sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";
   };
 
   patches = [ ./sddm-ignore-config-mtime.patch ];
 
-  nativeBuildInputs = [ cmake pkgconfig qttools ];
+  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ];
 
   buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
 

pkgs/applications/editors/emacs-modes/slime/default.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchFromGitHub, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "slime";
+  src = fetchFromGitHub {
+    owner = "slime";
+    repo = "slime";
+    rev = "f80c997ee9408a73637057759120c5b37b55d781";
+    sha256 = "06ncqxzidmis6d7xsyi5pamg4pvifmc8l854xaa847rhagsvw7ax";
+  };
+  buildInputs = [emacs];
+  installPhase = ''
+    rm -rf CVS
+    mkdir -p $out/share/emacs/site-lisp
+    cp -r . $out/share/emacs/site-lisp
+  '';
+  meta = {
+    homepage = "https://common-lisp.net/project/slime/";
+    description = "The Superior Lisp Interaction Mode for Emacs";
+    license = "GPL";
+  };
+}

pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch

@@ -1,28 +0,0 @@
-From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 30 Aug 2015 07:05:03 -0500
-Subject: [PATCH] qalculate filename string type
-
----
- src/backends/qalculate/qalculateexpression.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp
-index 1891baa..b2a1984 100644
---- a/src/backends/qalculate/qalculateexpression.cpp
-+++ b/src/backends/qalculate/qalculateexpression.cpp
-@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand()
- 	if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
- 	    plotParameters.filetype == PLOT_FILETYPE_PS  ||
- 	    (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
--	     plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
-+	     plotParameters.filename.substr(p-4,4) == basic_string<char>(".eps")) ||
- 	    (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
--	     plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
-+	     plotParameters.filename.substr(p-3,3) == basic_string<char>(".ps")))
- 	    setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str())));
- 	else
- 	    setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str())));
--- 
-2.5.0
-

pkgs/applications/kde-apps-15.04/default.nix

@@ -1,540 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ pkgs, newScope, kf5 ? null, plasma5 ? null, qt5 ? null, debug ? false }:
-
-let inherit (pkgs) autonix kde4 stdenv symlinkJoin; in
-
-with autonix; let inherit (stdenv) lib; in
-
-let
-  kf5_ = if kf5 != null then kf5 else pkgs.kf510;
-  plasma5_ = if plasma5 != null then plasma5 else pkgs.plasma53;
-  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
-in
-
-let
-
-  kf5 = kf5_.override { inherit debug qt5; };
-  plasma5 = plasma5_.override { inherit debug kf5 qt5; };
-  qt5 = qt5_;
-
-  kdeOrL10nPackage = name: pkg:
-    assert (builtins.isAttrs pkg);
-    if lib.hasPrefix "kde-l10n" pkg.name
-      then l10nPackage name pkg
-    else kdePackage name pkg;
-
-  kdePackage = name: pkg:
-    let defaultOverride = drv: drv // {
-          setupHook = ./setup-hook.sh;
-          cmakeFlags =
-            (drv.cmakeFlags or [])
-            ++ [ "-DBUILD_TESTING=OFF" ]
-            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-          meta = {
-            license = with stdenv.lib.licenses; [
-              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-            ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-          };
-        };
-        callPackage = newScope {
-          inherit (stdenv) mkDerivation;
-          inherit (pkgs) fetchurl;
-          inherit scope;
-        };
-    in mkPackage callPackage defaultOverride name pkg;
-
-  l10nPackage = name: pkg:
-    let nameVersion = builtins.parseDrvName pkg.name;
-
-        pkgQt4 = pkg // {
-          name = "${nameVersion.name}-qt4-${nameVersion.version}";
-          buildInputs = [ "kdelibs" "qt4" ];
-          nativeBuildInputs = [ "cmake" "gettext" "perl" ];
-          propagatedBuildInputs = [];
-          propagatedNativeBuildInputs = [];
-          propagatedUserEnvPkgs = [];
-        };
-        drvQt4 = overrideDerivation (kdePackage name pkgQt4) (drv: {
-          preConfigure = (drv.preConfigure or "") + ''
-            cd 4/
-          '';
-        });
-
-        pkgQt5 = pkg // {
-          name = "${nameVersion.name}-qt5-${nameVersion.version}";
-          buildInputs = [ "kdoctools" "ki18n" ];
-          nativeBuildInputs = [ "cmake" "extra-cmake-modules" "gettext" "perl" ];
-          propagatedBuildInputs = [];
-          propagatedNativeBuildInputs = [];
-          propagatedUserEnvPkgs = [];
-        };
-        drvQt5 = overrideDerivation (kdePackage name pkgQt5) (drv: {
-          preConfigure = (drv.preConfigure or "") + ''
-            cd 5/
-          '';
-        });
-    in symlinkJoin pkg.name [ drvQt4 drvQt5 ];
-
-  super =
-    let json = builtins.fromJSON (builtins.readFile ./packages.json);
-        mirrorUrl = n: pkg: pkg // {
-          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
-        };
-        renames =
-          (builtins.fromJSON (builtins.readFile ./kf5-renames.json))
-          // (builtins.fromJSON (builtins.readFile ./plasma5-renames.json))
-          // (builtins.fromJSON (builtins.readFile ./renames.json));
-        propagated = [ "extra-cmake-modules" ];
-        native = [
-          "bison"
-          "extra-cmake-modules"
-          "flex"
-          "kdoctools"
-          "ki18n"
-          "libxslt"
-          "perl"
-          "pythoninterp"
-        ];
-        user = [
-          "qt5"
-          "qt5core"
-          "qt5dbus"
-          "qt5gui"
-          "qt5qml"
-          "qt5quick"
-          "qt5svg"
-          "qt5webkitwidgets"
-          "qt5widgets"
-          "qt5x11extras"
-          "shareddesktopontologies"
-          "sharedmimeinfo"
-        ];
-    in lib.fold (f: attrs: f attrs) json [
-      (lib.mapAttrs kdeOrL10nPackage)
-      (userEnvDeps user)
-      (nativeDeps native)
-      (propagateDeps propagated)
-      (renameDeps renames)
-      (lib.mapAttrs mirrorUrl)
-    ];
-
-  kde4Package = pkg: overrideScope pkg (with kde4; {
-    inherit akonadi baloo kactivities libkdegames libkmahjongg;
-    kde4 = self.kdelibs;
-  });
-
-  scope =
-    # KDE Frameworks 5
-    kf5 //
-    # packages in this collection
-    self //
-    {
-      kf5baloo = plasma5.baloo;
-      kf5kdcraw = self.libkdcraw;
-      kf5kdegames = self.libkdegames;
-      kf5kipi = self.libkipi;
-      libkonq = self.kde-baseapps;
-    } //
-    # packages requiring same Qt 5
-    (with pkgs; {
-      accountsqt5 = accounts-qt.override { inherit qt5; };
-      dbusmenuqt = libdbusmenu_qt;
-      grantlee5 = grantlee5.override { inherit qt5; };
-      mlt = pkgs.mlt-qt5.override { inherit qt5; };
-      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      qca-qt5 = qca-qt5.override { inherit qt5; };
-      qt5script = qt5.script;
-      qt5x11extras = qt5.x11extras;
-      signonqt5 = signon.override { inherit qt5; };
-      telepathyqt5 = telepathy_qt5.override { inherit qt5; };
-    }) //
-    # packages from nixpkgs
-    (with pkgs; {
-      inherit acl attr automoc4 avahi bison cdparanoia cfitsio cmake cups
-              djvulibre docbook_xml_dtd_42 docbook_xsl enchant eigen2
-              exiv2 fam ffmpeg flac flex freetype gmp gettext gpgme
-              grantlee gsl hunspell ilmbase intltool jasper lcms2
-              libaccounts-glib libgcrypt libotr libraw libssh libspectre
-              libvncserver libical networkmanager openal opencv
-              openexr perl phonon pkgconfig polkit_qt4 prison python qca2
-              qimageblitz qjson qt4 samba saneBackends soprano speechd
-              strigi taglib udev xorg xplanet xscreensaver xz;
-      alsa = alsaLib;
-      assuan = libassuan;
-      boost = boost155;
-      canberra = libcanberra;
-      eigen3 = eigen;
-      epub = ebook_tools;
-      gif = giflib;
-      gphoto2 = libgphoto2;
-      hupnp = herqq;
-      indi = indilib;
-      jpeg = libjpeg;
-      ldap = openldap;
-      libattica = attica;
-      musicbrainz3 = libmusicbrainz;
-      oggvorbis = libvorbis;
-      poppler = poppler_qt4;
-      pulseaudio = libpulseaudio;
-      qalculate = libqalculate;
-      sasl2 = cyrus_sasl;
-      shareddesktopontologies = shared_desktop_ontologies;
-      sharedmimeinfo = shared_mime_info;
-      sndfile = libsndfile;
-      tiff = libtiff;
-      telepathyqt4 = telepathy_qt;
-      tunepimp = libtunepimp;
-      usb = libusb;
-      xsltproc = libxslt;
-    });
-
-  self =
-    (builtins.removeAttrs super [
-      "artikulate" # build failure; wrong boost?
-      "kde-dev-scripts" "kde-dev-utils" # docbook errors
-      "kdewebdev" # unknown build failure
-      "kde-l10n-sr" # missing CMake command
-    ]) // {
-      audiocd-kio = kde4Package super.audiocd-kio;
-
-      amor = kde4Package super.amor;
-
-      ark = extendDerivation (kde4Package super.ark) {
-        buildInputs = [ pkgs.makeWrapper ];
-        # runtime dependency
-        postInstall = ''
-          wrapProgram $out/bin/ark --prefix PATH : "${pkgs.unzipNLS}/bin"
-        '';
-      };
-
-      cantor = extendDerivation (kde4Package super.cantor) {
-        patches = [ ./cantor/0001-qalculate-filename-string-type.patch ];
-      };
-
-      cervisia = kde4Package super.cervisia;
-
-      dolphin-plugins = kde4Package super.dolphin-plugins;
-
-      dragon = kde4Package super.dragon;
-
-      ffmpegthumbs = extendDerivation (kde4Package super.ffmpegthumbs) {
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      juk = kde4Package super.juk;
-
-      jovie = kde4Package super.jovie;
-
-      kaccessible = kde4Package super.kaccessible;
-
-      kaccounts-providers = extendDerivation super.kaccounts-providers {
-        buildInputs = [ pkgs.libaccounts-glib ];
-        # hard-coded install path
-        preConfigure = ''
-          substituteInPlace webkit-options/CMakeLists.txt \
-            --replace "/etc/signon-ui/webkit-options.d/" \
-                      "$out/etc/signon-ui/webkit-options.d/"
-        '';
-      };
-
-      kajongg = kde4Package super.kajongg;
-
-      kalzium = extendDerivation (kde4Package super.kalzium) {
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      kamera = kde4Package super.kamera;
-
-      kate = extendDerivation super.kate {
-        buildInputs = with scope; [
-          kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets kio
-          kparts ktexteditor kwindowsystem kxmlgui
-        ];
-        nativeBuildInputs = [ scope.kdoctools ];
-      };
-
-      kcachegrind = kde4Package super.kcachegrind;
-
-      kcolorchooser = kde4Package super.kcolorchooser;
-
-      kde-base-artwork = kde4Package super.kde-base-artwork;
-
-      kde-baseapps = kde4Package super.kde-baseapps;
-
-      kde-runtime = extendDerivation (kde4Package super.kde-runtime) {
-        buildInputs = [ scope.canberra ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-        # cmake does not detect path to `ilmbase`
-        NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR -I${pkgs.glib}/include/glib-2.0 -I${pkgs.glib}/lib/glib-2.0/include";
-        # some components of this package have been replaced in other packages
-        meta = { priority = 10; };
-      };
-
-      kde-wallpapers = kde4Package super.kde-wallpapers;
-
-      kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
-        patches = [ ./kde-workspace/ksysguard-0001-disable-signalplottertest.patch ];
-        buildInputs = with scope.xorg; [
-            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
-        ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-        # some components of this package have been replaced in other packages
-        meta = { priority = 10; };
-      };
-
-      kdeartwork = kde4Package super.kdeartwork;
-
-      kdegraphics-mobipocket = kde4Package super.kdegraphics-mobipocket;
-
-      kdegraphics-strigi-analyzer = kde4Package super.kdegraphics-strigi-analyzer;
-
-      kdegraphics-thumbnailers = kde4Package super.kdegraphics-thumbnailers;
-
-      kdelibs = extendDerivation super.kdelibs {
-        buildInputs = with scope; [ attr polkit_qt4 xsltproc xz ];
-        propagatedBuildInputs = with scope; [ qt4 soprano phonon strigi ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-        propagatedNativeBuildInputs = with scope; [
-          automoc4 cmake perl sharedmimeinfo
-        ];
-
-        patches = [ ./kdelibs/polkit-install.patch ];
-
-        # cmake does not detect path to `ilmbase`
-        NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
-
-        cmakeFlags = [
-          "-DDOCBOOKXML_CURRENTDTD_DIR=${scope.docbook_xml_dtd_42}/xml/dtd/docbook"
-          "-DDOCBOOKXSL_DIR=${scope.docbook_xsl}/xml/xsl/docbook"
-          "-DHUPNP_ENABLED=ON"
-          "-DWITH_SOLID_UDISKS2=ON"
-          "-DKDE_DEFAULT_HOME=.kde"
-        ];
-      };
-
-      kdenetwork-filesharing = kde4Package super.kdenetwork-filesharing;
-
-      kdenetwork-strigi-analyzers = kde4Package super.kdenetwork-strigi-analyzers;
-
-      kdenlive = extendDerivation super.kdenlive { buildInputs = [ scope.mlt ]; };
-
-      kdepim = extendDerivation (kde4Package super.kdepim) {
-        buildInputs = with scope; [ gpgme assuan ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      kdepim-runtime = kde4Package super.kdepim-runtime;
-
-      kdepimlibs = extendDerivation (kde4Package super.kdepimlibs) {
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      kdesdk-kioslaves = kde4Package super.kdesdk-kioslaves;
-
-      kdesdk-strigi-analyzers = kde4Package super.kdesdk-strigi-analyzers;
-
-      kdesdk-thumbnailers =
-        extendDerivation (kde4Package super.kdesdk-thumbnailers) {
-          nativeBuildInputs = [ scope.gettext ];
-        };
-
-      kdf = kde4Package super.kdf;
-
-      kfloppy = kde4Package super.kfloppy;
-
-      kgamma = kde4Package super.kgamma;
-
-      kget = kde4Package super.kget;
-
-      kgoldrunner = kde4Package super.kgoldrunner;
-
-      kgpg = extendDerivation (kde4Package super.kgpg) {
-        buildInputs = [ scope.boost ];
-      };
-
-      khangman = extendDerivation super.khangman { buildInputs = [ scope.kio ]; };
-
-      kigo = kde4Package super.kigo;
-
-      kiriki = kde4Package super.kiriki;
-
-      klickety = kde4Package super.klickety;
-
-      kmag = kde4Package super.kmag;
-
-      kmahjongg = kde4Package super.kmahjongg;
-
-      kmix = extendDerivation super.kmix {
-        nativeBuildInputs = [ scope.pkgconfig ];
-        cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
-      };
-
-      kmousetool = extendDerivation (kde4Package super.kmousetool) {
-        buildInputs = with scope.xorg; [ libXtst libXt ];
-      };
-
-      kmouth = kde4Package super.kmouth;
-
-      knavalbattle = kde4Package super.knavalbattle;
-
-      kolf = kde4Package super.kolf;
-
-      kolourpaint = kde4Package super.kolourpaint;
-
-      konquest = kde4Package super.konquest;
-
-      kopete = kde4Package super.kopete;
-
-      kppp = kde4Package super.kppp;
-
-      kqtquickcharts = kde4Package super.kqtquickcharts;
-
-      krdc = kde4Package super.krdc;
-
-      kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
-        buildInputs = [ scope.xorg.libXtst ];
-      };
-
-      kreversi = kde4Package super.kreversi;
-
-      krfb = extendDerivation (kde4Package super.krfb) {
-        buildInputs = with scope; [ xorg.libXtst ktp-common-internals ];
-      };
-
-      ksaneplugin = kde4Package super.ksaneplugin;
-
-      kscd = kde4Package super.kscd;
-
-      ksirk = kde4Package super.ksirk;
-
-      ksnakeduel = kde4Package super.ksnakeduel;
-
-      ksnapshot = kde4Package super.ksnapshot;
-
-      kspaceduel = kde4Package super.kspaceduel;
-
-      kstars = extendDerivation super.kstars {
-        buildInputs = with scope; [ kparts cfitsio ];
-      };
-
-      ksudoku = kde4Package super.ksudoku;
-
-      ksystemlog = kde4Package super.ksystemlog;
-
-      ktp-accounts-kcm = extendDerivation super.ktp-accounts-kcm {
-        buildInputs = [ scope.libaccounts-glib ];
-      };
-
-      ktp-common-internals = extendDerivation super.ktp-common-internals {
-        buildInputs = with scope; [ kdelibs4support kparts libotr ];
-      };
-
-      ktp-text-ui = extendDerivation super.ktp-text-ui {
-        buildInputs = [ scope.kdbusaddons ];
-      };
-
-      ktuberling = kde4Package super.ktuberling;
-
-      ktux = kde4Package super.ktux;
-
-      kubrick = kde4Package super.kubrick;
-
-      kuser = kde4Package super.kuser;
-
-      kwalletmanager = kde4Package super.kwalletmanager;
-
-      lokalize = extendDerivation super.lokalize {
-        buildInputs = [ scope.kdbusaddons ];
-      };
-
-      libkcddb = kde4Package super.libkcddb;
-
-      libkcompactdisc = kde4Package super.libkcompactdisc;
-
-      libkdcraw = extendDerivation super.libkdcraw {
-        buildInputs = with scope; [ kdelibs libraw ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      libkdeedu = kde4Package super.libkdeedu;
-
-      libkexiv2 = extendDerivation super.libkexiv2 {
-        buildInputs = with scope; [ exiv2 kdelibs ];
-      };
-
-      libkface = extendDerivation super.libkface {
-        buildInputs = with scope; [ kdelibs opencv ];
-      };
-
-      libkgeomap = extendDerivation (kde4Package super.libkgeomap) {
-        cmakeFlags =
-          [ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ];
-      };
-
-      libkipi = extendDerivation super.libkipi {
-        buildInputs = [ scope.kdelibs ];
-      };
-
-      libksane = extendDerivation super.libksane {
-        buildInputs = with scope; [ kdelibs saneBackends];
-      };
-
-      lskat = kde4Package super.lskat;
-
-      marble = kde4Package super.marble;
-
-      mplayerthumbs = kde4Package super.mplayerthumbs;
-
-      okular = extendDerivation (kde4Package super.okular) {
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      pairs = kde4Package super.pairs;
-
-      palapeli = kde4Package super.palapeli;
-
-      picmi = kde4Package super.picmi;
-
-      poxml = kde4Package super.poxml;
-
-      rocs = extendDerivation super.rocs {
-        buildInputs = [ scope.kdelibs4support ];
-      };
-
-      signon-kwallet-extension = extendDerivation super.signon-kwallet-extension {
-        buildInputs = [ scope.signonqt5 ];
-        preConfigure = ''
-          sed -i src/CMakeLists.txt \
-              -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions,"
-        '';
-      };
-
-      superkaramba = kde4Package super.superkaramba;
-
-      svgpart = kde4Package super.svgpart;
-
-      sweeper = kde4Package super.sweeper;
-
-      umbrello = kde4Package super.umbrello;
-
-      zeroconf-ioslave = kde4Package super.zeroconf-ioslave;
-
-    };
-
-in self

pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch

@@ -1,36 +0,0 @@
-From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 7 Sep 2015 18:55:44 -0500
-Subject: [PATCH] ksysguard disable signalplottertest
-
----
- libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
-index d472fd7..f178b71 100644
---- a/libs/ksysguard/tests/CMakeLists.txt
-+++ b/libs/ksysguard/tests/CMakeLists.txt
-@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
- set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
- kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
- target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
--
--
--# KGraphicsSignalPlotter benchmark
--set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
--kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
--target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
--
--
--# KSignalPlotter unit test
--set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
--kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
--target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
--
--
--
--
--- 
-2.5.0
-

pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch

@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)

pkgs/applications/kde-apps-15.04/kf5-renames.json

@@ -1,70 +0,0 @@
-{
-    "kf5widgetsaddons": "kwidgetsaddons",
-    "kf5texteditor": "ktexteditor",
-    "kf5designerplugin": "kdesignerplugin",
-    "kf5bookmarks": "kbookmarks",
-    "kf5frameworkintegration": "frameworkintegration",
-    "kf5package": "kpackage",
-    "kf5archive": "karchive",
-    "kf5plasma": "plasma-framework",
-    "kf5kcmutils": "kcmutils",
-    "kf5configwidgets": "kconfigwidgets",
-    "ctest": "attica",
-    "kf5kio": "kio",
-    "kf5networkmanagerqt": "networkmanager-qt",
-    "kf5coreaddons": "kcoreaddons",
-    "kf5guiaddons": "kguiaddons",
-    "kf5jobwidgets": "kjobwidgets",
-    "kf5modemmanagerqt": "modemmanager-qt",
-    "kf5runner": "krunner",
-    "kf5globalaccel": "kglobalaccel",
-    "kf5dbusaddons": "kdbusaddons",
-    "kf5crash": "kcrash",
-    "kf5itemviews": "kitemviews",
-    "kf5doctools": "kdoctools",
-    "kf5i18n": "ki18n",
-    "kf5webkit": "kdewebkit",
-    "kf5newstuff": "knewstuff",
-    "kded": "kded",
-    "kf5notifications": "knotifications",
-    "kf5activitiesexperimentalstats": "kactivities",
-    "kf5dnssd": "kdnssd",
-    "kf5notifyconfig": "knotifyconfig",
-    "kf5iconthemes": "kiconthemes",
-    "kf5js": "kjs",
-    "kf5kde4support": "kdelibs4support",
-    "kf5parts": "kparts",
-    "backend": "plasma-framework",
-    "kf5completion": "kcompletion",
-    "kf5threadweaver": "threadweaver",
-    "kf5mediaplayer": "kmediaplayer",
-    "kf5plasmaquick": "plasma-framework",
-    "kf5wallet": "kwallet",
-    "kf5xmlgui": "kxmlgui",
-    "kf5attica": "attica",
-    "kf5declarative": "kdeclarative",
-    "kf5config": "kconfig",
-    "kf5init": "kinit",
-    "kf5textwidgets": "ktextwidgets",
-    "kf5jsembed": "kjsembed",
-    "kf5codecs": "kcodecs",
-    "kf5service": "kservice",
-    "kf5sonnet": "sonnet",
-    "kf5kdelibs4support": "kdelibs4support",
-    "kf5pty": "kpty",
-    "kf5solid": "solid",
-    "kf5auth": "kauth",
-    "ecm": "extra-cmake-modules",
-    "kf5activities": "kactivities",
-    "kf5plotting": "kplotting",
-    "kf5people": "kpeople",
-    "kf5emoticons": "kemoticons",
-    "kf5kross": "kross",
-    "kf5su": "kdesu",
-    "kf5khtml": "khtml",
-    "kf5unitconversion": "kunitconversion",
-    "kf5idletime": "kidletime",
-    "kf5windowsystem": "kwindowsystem",
-    "kf5xmlrpcclient": "kxmlrpcclient",
-    "kf5itemmodels": "kitemmodels"
-}

pkgs/applications/kde-apps-15.04/packages.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -x
-
-origin="$(pwd)"
-
-# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
-KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
-
-alias nix-build="nix-build --no-out-link \"$origin/../../..\""
-
-# The extra slash at the end of the URL is necessary to stop wget
-# from recursing over the whole server! (No, it's not a bug.)
-$(nix-build -A autonix.manifest) \
-    "${KDE_MIRROR}/stable/applications/15.04.3/" \
-    "$@" -A '*.tar.xz'
-
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
-
-$AUTONIX_DEPS_KF5 manifest.json
-
-rm manifest.json

pkgs/applications/kde-apps-15.04/plasma5-renames.json

@@ -1,20 +0,0 @@
-{
-    "kf5sysguard": "libksysguard",
-    "kf5baloo": "baloo",
-    "krunnerappdbusinterface": "plasma-workspace",
-    "screensaverdbusinterface": "plasma-workspace",
-    "ctest": "kdeplasma-addons",
-    "kf5filemetadata": "kfilemetadata",
-    "kwindbusinterface": "kwin",
-    "kf5activitiesexperimentalstats": "plasma-desktop",
-    "khotkeysdbusinterface": "khotkeys",
-    "libkworkspace": "plasma-workspace",
-    "libtaskmanager": "plasma-workspace",
-    "backend": "powerdevil",
-    "kf5screen": "libkscreen",
-    "ksmserverdbusinterface": "plasma-workspace",
-    "kf5wayland": "kwayland",
-    "kdecoration2": "kdecoration",
-    "kf5bluezqt": "bluez-qt",
-    "oxygenfont": "oxygen-fonts"
-}

pkgs/applications/kde-apps-15.04/renames.json

@@ -1,31 +0,0 @@
-{
-    "libkomparediff2": "libkomparediff2",
-    "kdegames": "libkdegames",
-    "ksane": "libksane",
-    "ctest": "sweeper",
-    "kastencore": "okteta",
-    "kastengui": "okteta",
-    "gpgmepp": "kdepimlibs",
-    "oktetacore": "okteta",
-    "kf5kmahjongglib": "libkmahjongg",
-    "oktetagui": "okteta",
-    "libkcompactdisc": "libkcompactdisc",
-    "libkdeedu": "libkdeedu",
-    "kaccounts": "kaccounts-integration",
-    "kastencontrollers": "okteta",
-    "backend": "kde-workspace",
-    "ktp": "ktp-common-internals",
-    "kdepimlibs": "kdepimlibs",
-    "qjdns": "kopete",
-    "libkeduvocdocument": "libkeduvocdocument",
-    "oktetakastencore": "okteta",
-    "libkcddb": "libkcddb",
-    "oktetakastengui": "okteta",
-    "kde4workspace": "kde-workspace",
-    "jdns": "kopete",
-    "okular": "okular",
-    "qmobipocket": "kdegraphics-mobipocket",
-    "kdeclarative": "kdelibs",
-    "analitza5": "analitza",
-    "oktetakastencontrollers": "okteta"
-}

pkgs/applications/kde-apps-15.04/setup-hook.sh

@@ -1,12 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
-
-addQt4Plugins() {
-  if [[ -d "$1/lib/qt4/plugins" ]]; then
-      propagatedUserEnvPkgs+=" $1"
-  fi
-
-  if [[ -d "$1/lib/kde4/plugins" ]]; then
-      propagatedUserEnvPkgs+=" $1"
-  fi
-}
-envHooks+=(addQt4Plugins)

pkgs/applications/kde-apps-15.08/ark.nix

@@ -14,8 +14,17 @@
 , kpty
 , kwidgetsaddons
 , libarchive
+, p7zip
+, unrar
+, unzipNLS
+, zip
 }:
 
+let PATH = lib.makeSearchPath "bin" [
+      p7zip unrar unzipNLS zip
+    ];
+in
+
 kdeApp {
   name = "ark";
   nativeBuildInputs = [
@@ -27,15 +36,21 @@ kdeApp {
     kconfig
     kcrash
     kdbusaddons
-    ki18n
     kiconthemes
-    khtml
-    kio
     kservice
     kpty
     kwidgetsaddons
     libarchive
   ];
+  propagatedBuildInputs = [
+    khtml
+    ki18n
+    kio
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/ark" \
+        --prefix PATH : "${PATH}"
+  '';
   meta = {
     license = with lib.licenses; [ gpl2 lgpl3 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/applications/kde-apps-15.08/baloo-widgets.nix

@@ -19,12 +19,14 @@ kdeApp {
   ];
   buildInputs = [
     kconfig
-    kio
-    ki18n
     kservice
-    kfilemetadata
+  ];
+  propagatedBuildInputs = [
     baloo
     kdelibs4support
+    kfilemetadata
+    ki18n
+    kio
   ];
   meta = {
     license = [ lib.licenses.lgpl21 ];

pkgs/applications/kde-apps-15.08/default.nix

@@ -21,25 +21,10 @@ let
   srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
   mirror = "mirror://kde";
 
-  kdeApp = args:
-    let
-      inherit (args) name;
-      sname = args.sname or name;
-      inherit (srcs."${sname}") src version;
-    in stdenv.mkDerivation (args // {
-      name = "${name}-${version}";
-      inherit src;
-
-      cmakeFlags =
-        (args.cmakeFlags or [])
-        ++ [ "-DBUILD_TESTING=OFF" ]
-        ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-      meta = {
-        platforms = lib.platforms.linux;
-        homepage = "http://www.kde.org";
-      } // (args.meta or {});
-    });
+  kdeApp = import ./kde-app.nix {
+    inherit stdenv lib;
+    inherit debug srcs;
+  };
 
   packages = self: with self; {
     kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
@@ -60,9 +45,12 @@ let
     libkexiv2 = callPackage ./libkexiv2.nix {};
     libkipi = callPackage ./libkipi.nix {};
     okular = callPackage ./okular.nix {};
+    oxygen-icons = callPackage ./oxygen-icons.nix {};
     print-manager = callPackage ./print-manager.nix {};
+
+    l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
   };
 
-  newScope = scope: pkgs.kf514.newScope ({ inherit kdeApp; } // scope);
+  newScope = scope: pkgs.kf515.newScope ({ inherit kdeApp; } // scope);
 
 in lib.makeScope newScope packages

pkgs/applications/kde-apps-15.08/dolphin-plugins.nix

@@ -17,10 +17,12 @@ kdeApp {
   ];
   buildInputs = [
     kxmlgui
+    dolphin
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support
     ki18n
     kio
-    kdelibs4support
-    dolphin
   ];
   meta = {
     license = [ lib.licenses.gpl2 ];

pkgs/applications/kde-apps-15.08/dolphin.nix

@@ -2,6 +2,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, makeQtWrapper
 , kinit
 , kcmutils
 , kcoreaddons
@@ -31,31 +32,37 @@ kdeApp {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
     kinit
     kcmutils
     kcoreaddons
     knewstuff
-    ki18n
     kdbusaddons
     kbookmarks
     kconfig
-    kio
     kparts
     solid
     kiconthemes
     kcompletion
+    knotifications
+    phonon
+    baloo-widgets
+  ];
+  propagatedBuildInputs = [
+    baloo
+    kactivities
+    kdelibs4support
+    kfilemetadata
+    ki18n
+    kio
     ktexteditor
     kwindowsystem
-    knotifications
-    kactivities
-    phonon
-    baloo
-    baloo-widgets
-    kfilemetadata
-    kdelibs4support
   ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/dolphin"
+  '';
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/applications/kde-apps-15.08/fetchsrcs.sh

@@ -4,14 +4,13 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/applications/15.08.1/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
+WGET_ARGS='http://download.kde.org/stable/applications/15.08.2/ http://download.kde.org/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz -A *.tar.xz'
 
 mkdir tmp; cd tmp
 
 rm -f ../srcs.csv
 
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
+wget -nH -r -c --no-parent $WGET_ARGS
 
 find . | while read src; do
     if [[ -f "${src}" ]]; then

pkgs/applications/kde-apps-15.08/gwenview.nix

@@ -2,6 +2,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, makeQtWrapper
 , baloo
 , exiv2
 , kactivities
@@ -18,18 +19,24 @@ kdeApp {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    baloo
     exiv2
-    kactivities
-    kdelibs4support
-    kio
     lcms2
     phonon
     qtsvg
+  ];
+  propagatedBuildInputs = [
+    baloo
+    kactivities
+    kdelibs4support
+    kio
     qtx11extras
   ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/gwenview"
+  '';
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/applications/kde-apps-15.08/kate.nix

@@ -34,28 +34,34 @@ kdeApp {
   ];
   buildInputs = [
     qtscript
-    kactivities
     kconfig
     kcrash
     kguiaddons
     kiconthemes
-    ki18n
     kinit
     kjobwidgets
-    kio
     kparts
-    ktexteditor
-    kwindowsystem
     kxmlgui
     kdbusaddons
     kwallet
-    plasma-framework
     kitemmodels
     knotifications
     threadweaver
     knewstuff
     libgit2
   ];
+  propagatedBuildInputs = [
+    kactivities
+    ki18n
+    kio
+    ktexteditor
+    kwindowsystem
+    plasma-framework
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kate"
+    wrapQtProgram "$out/bin/kwrite"
+  '';
   meta = {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/applications/kde-apps-15.08/kde-app.nix

@@ -0,0 +1,23 @@
+{ stdenv, lib, debug, srcs }:
+
+args:
+
+let
+  inherit (args) name;
+  sname = args.sname or name;
+  inherit (srcs."${sname}") src version;
+in
+stdenv.mkDerivation (args // {
+  name = "${name}-${version}";
+  inherit src;
+
+  cmakeFlags =
+    (args.cmakeFlags or [])
+    ++ [ "-DBUILD_TESTING=OFF" ]
+    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+  meta = {
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+  } // (args.meta or {});
+})

pkgs/applications/kde-apps-15.08/kde-locale-4.nix

@@ -0,0 +1,20 @@
+name: args:
+
+{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }:
+
+kdeApp (args // {
+  sname = "kde-l10n-${name}";
+  name = "kde-l10n-${name}-qt4";
+
+  nativeBuildInputs =
+    [ automoc4 cmake gettext perl ]
+    ++ (args.nativeBuildInputs or []);
+  buildInputs =
+    [ kdelibs ]
+    ++ (args.buildInputs or []);
+
+  preConfigure = ''
+    sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
+    ${args.preConfigure or ""}
+  '';
+})

pkgs/applications/kde-apps-15.08/kde-locale-5.nix

@@ -0,0 +1,17 @@
+name: args:
+
+{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
+
+kdeApp (args // {
+  sname = "kde-l10n-${name}";
+  name = "kde-l10n-${name}-qt5";
+
+  nativeBuildInputs =
+    [ cmake extra-cmake-modules gettext kdoctools ]
+    ++ (args.nativeBuildInputs or []);
+
+  preConfigure = ''
+    sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
+    ${args.preConfigure or ""}
+  '';
+})

pkgs/applications/kde-apps-15.08/kgpg.nix

@@ -2,12 +2,14 @@
 , lib
 , automoc4
 , cmake
+, makeWrapper
 , perl
 , pkgconfig
 , boost
 , gpgme
 , kdelibs
 , kdepimlibs
+, gnupg
 }:
 
 kdeApp {
@@ -15,6 +17,7 @@ kdeApp {
   nativeBuildInputs = [
     automoc4
     cmake
+    makeWrapper
     perl
     pkgconfig
   ];
@@ -24,6 +27,10 @@ kdeApp {
     kdelibs
     kdepimlibs
   ];
+  postInstall = ''
+    wrapProgram "$out/bin/kgpg" \
+        --prefix PATH : "${gnupg}/bin"
+  '';
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/applications/kde-apps-15.08/konsole.nix

@@ -2,6 +2,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, makeQtWrapper
 , qtscript
 , kbookmarks
 , kcompletion
@@ -30,6 +31,7 @@ kdeApp {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
     qtscript
@@ -39,10 +41,8 @@ kdeApp {
     kconfigwidgets
     kcoreaddons
     kguiaddons
-    ki18n
     kiconthemes
     kinit
-    kdelibs4support
     kio
     knotifications
     knotifyconfig
@@ -51,9 +51,16 @@ kdeApp {
     kservice
     ktextwidgets
     kwidgetsaddons
-    kwindowsystem
     kxmlgui
   ];
+  propagatedBuildInputs = [
+    kdelibs4support
+    ki18n
+    kwindowsystem
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/konsole"
+  '';
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/applications/kde-apps-15.08/l10n.nix

@@ -0,0 +1,231 @@
+{ callPackage, pkgs, lib }:
+
+let
+
+  kdeLocale4 = import ./kde-locale-4.nix;
+  kdeLocale5 = import ./kde-locale-5.nix;
+
+in
+
+lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
+  ar = {
+    qt4 = callPackage (kdeLocale4 "ar" {}) {};
+    qt5 = callPackage (kdeLocale5 "ar" {}) {};
+  };
+  bg = {
+    qt4 = callPackage (kdeLocale4 "bg" {}) {};
+    qt5 = callPackage (kdeLocale5 "bg" {}) {};
+  };
+  bs = {
+    qt4 = callPackage (kdeLocale4 "bs" {}) {};
+    qt5 = callPackage (kdeLocale5 "bs" {}) {};
+  };
+  ca = {
+    qt4 = callPackage (kdeLocale4 "ca" {}) {};
+    qt5 = callPackage (kdeLocale5 "ca" {}) {};
+  };
+  ca_valencia = {
+    qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
+    qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
+  };
+  cs = {
+    qt4 = callPackage (kdeLocale4 "cs" {}) {};
+    qt5 = callPackage (kdeLocale5 "cs" {}) {};
+  };
+  da = {
+    qt4 = callPackage (kdeLocale4 "da" {}) {};
+    qt5 = callPackage (kdeLocale5 "da" {}) {};
+  };
+  de = {
+    qt4 = callPackage (kdeLocale4 "de" {}) {};
+    qt5 = callPackage (kdeLocale5 "de" {}) {};
+  };
+  el = {
+    qt4 = callPackage (kdeLocale4 "el" {}) {};
+    qt5 = callPackage (kdeLocale5 "el" {}) {};
+  };
+  en_GB = {
+    qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
+    qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
+  };
+  eo = {
+    qt4 = callPackage (kdeLocale4 "eo" {}) {};
+    qt5 = callPackage (kdeLocale5 "eo" {}) {};
+  };
+  es = {
+    qt4 = callPackage (kdeLocale4 "es" {}) {};
+    qt5 = callPackage (kdeLocale5 "es" {}) {};
+  };
+  et = {
+    qt4 = callPackage (kdeLocale4 "et" {}) {};
+    qt5 = callPackage (kdeLocale5 "et" {}) {};
+  };
+  eu = {
+    qt4 = callPackage (kdeLocale4 "eu" {}) {};
+    qt5 = callPackage (kdeLocale5 "eu" {}) {};
+  };
+  fa = {
+    qt4 = callPackage (kdeLocale4 "fa" {}) {};
+    qt5 = callPackage (kdeLocale5 "fa" {}) {};
+  };
+  fi = {
+    qt4 = callPackage (kdeLocale4 "fi" {}) {};
+    qt5 = callPackage (kdeLocale5 "fi" {}) {};
+  };
+  fr = {
+    qt4 = callPackage (kdeLocale4 "fr" {}) {};
+    qt5 = callPackage (kdeLocale5 "fr" {}) {};
+  };
+  ga = {
+    qt4 = callPackage (kdeLocale4 "ga" {}) {};
+    qt5 = callPackage (kdeLocale5 "ga" {}) {};
+  };
+  gl = {
+    qt4 = callPackage (kdeLocale4 "gl" {}) {};
+    qt5 = callPackage (kdeLocale5 "gl" {}) {};
+  };
+  he = {
+    qt4 = callPackage (kdeLocale4 "he" {}) {};
+    qt5 = callPackage (kdeLocale5 "he" {}) {};
+  };
+  hi = {
+    qt4 = callPackage (kdeLocale4 "hi" {}) {};
+    qt5 = callPackage (kdeLocale5 "hi" {}) {};
+  };
+  hr = {
+    qt4 = callPackage (kdeLocale4 "hr" {}) {};
+    qt5 = callPackage (kdeLocale5 "hr" {}) {};
+  };
+  hu = {
+    qt4 = callPackage (kdeLocale4 "hu" {}) {};
+    qt5 = callPackage (kdeLocale5 "hu" {}) {};
+  };
+  ia = {
+    qt4 = callPackage (kdeLocale4 "ia" {}) {};
+    qt5 = callPackage (kdeLocale5 "ia" {}) {};
+  };
+  id = {
+    qt4 = callPackage (kdeLocale4 "id" {}) {};
+    qt5 = callPackage (kdeLocale5 "id" {}) {};
+  };
+  is = {
+    qt4 = callPackage (kdeLocale4 "is" {}) {};
+    qt5 = callPackage (kdeLocale5 "is" {}) {};
+  };
+  it = {
+    qt4 = callPackage (kdeLocale4 "it" {}) {};
+    qt5 = callPackage (kdeLocale5 "it" {}) {};
+  };
+  ja = {
+    qt4 = callPackage (kdeLocale4 "ja" {}) {};
+    qt5 = callPackage (kdeLocale5 "ja" {}) {};
+  };
+  kk = {
+    qt4 = callPackage (kdeLocale4 "kk" {}) {};
+    qt5 = callPackage (kdeLocale5 "kk" {}) {};
+  };
+  km = {
+    qt4 = callPackage (kdeLocale4 "km" {}) {};
+    qt5 = callPackage (kdeLocale5 "km" {}) {};
+  };
+  ko = {
+    qt4 = callPackage (kdeLocale4 "ko" {}) {};
+    qt5 = callPackage (kdeLocale5 "ko" {}) {};
+  };
+  lt = {
+    qt4 = callPackage (kdeLocale4 "lt" {}) {};
+    qt5 = callPackage (kdeLocale5 "lt" {}) {};
+  };
+  lv = {
+    qt4 = callPackage (kdeLocale4 "lv" {}) {};
+    qt5 = callPackage (kdeLocale5 "lv" {}) {};
+  };
+  mr = {
+    qt4 = callPackage (kdeLocale4 "mr" {}) {};
+    qt5 = callPackage (kdeLocale5 "mr" {}) {};
+  };
+  nb = {
+    qt4 = callPackage (kdeLocale4 "nb" {}) {};
+    qt5 = callPackage (kdeLocale5 "nb" {}) {};
+  };
+  nds = {
+    qt4 = callPackage (kdeLocale4 "nds" {}) {};
+    qt5 = callPackage (kdeLocale5 "nds" {}) {};
+  };
+  nl = {
+    qt4 = callPackage (kdeLocale4 "nl" {}) {};
+    qt5 = callPackage (kdeLocale5 "nl" {}) {};
+  };
+  nn = {
+    qt4 = callPackage (kdeLocale4 "nn" {}) {};
+    qt5 = callPackage (kdeLocale5 "nn" {}) {};
+  };
+  pa = {
+    qt4 = callPackage (kdeLocale4 "pa" {}) {};
+    qt5 = callPackage (kdeLocale5 "pa" {}) {};
+  };
+  pl = {
+    qt4 = callPackage (kdeLocale4 "pl" {}) {};
+    qt5 = callPackage (kdeLocale5 "pl" {}) {};
+  };
+  pt = {
+    qt4 = callPackage (kdeLocale4 "pt" {}) {};
+    qt5 = callPackage (kdeLocale5 "pt" {}) {};
+  };
+  pt_BR = {
+    qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
+    qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
+  };
+  ro = {
+    qt4 = callPackage (kdeLocale4 "ro" {}) {};
+    qt5 = callPackage (kdeLocale5 "ro" {}) {};
+  };
+  ru = {
+    qt4 = callPackage (kdeLocale4 "ru" {}) {};
+    qt5 = callPackage (kdeLocale5 "ru" {}) {};
+  };
+  sk = {
+    qt4 = callPackage (kdeLocale4 "sk" {}) {};
+    qt5 = callPackage (kdeLocale5 "sk" {}) {};
+  };
+  sl = {
+    qt4 = callPackage (kdeLocale4 "sl" {}) {};
+    qt5 = callPackage (kdeLocale5 "sl" {}) {};
+  };
+  sr = {
+    qt4 = callPackage (kdeLocale4 "sr" {}) {};
+    qt5 = callPackage (kdeLocale5 "sr" {
+      preConfigure = ''
+        sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
+      '';
+    }) {};
+  };
+  sv = {
+    qt4 = callPackage (kdeLocale4 "sv" {}) {};
+    qt5 = callPackage (kdeLocale5 "sv" {}) {};
+  };
+  tr = {
+    qt4 = callPackage (kdeLocale4 "tr" {}) {};
+    qt5 = callPackage (kdeLocale5 "tr" {}) {};
+  };
+  ug = {
+    qt4 = callPackage (kdeLocale4 "ug" {}) {};
+    qt5 = callPackage (kdeLocale5 "ug" {}) {};
+  };
+  uk = {
+    qt4 = callPackage (kdeLocale4 "uk" {}) {};
+    qt5 = callPackage (kdeLocale5 "uk" {}) {};
+  };
+  wa = {
+    qt4 = callPackage (kdeLocale4 "wa" {}) {};
+    qt5 = callPackage (kdeLocale5 "wa" {}) {};
+  };
+  zh_CN = {
+    qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
+    qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
+  };
+  zh_TW = {
+    qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
+    qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
+  };
+}

pkgs/applications/kde-apps-15.08/oxygen-icons.nix

@@ -0,0 +1,13 @@
+{ kdeApp
+, lib
+, cmake
+}:
+
+kdeApp {
+  name = "oxygen-icons";
+  nativeBuildInputs = [ cmake ];
+  meta = {
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}

pkgs/applications/kde-apps-15.08/print-manager.nix

@@ -23,21 +23,23 @@ kdeApp {
     extra-cmake-modules
   ];
   buildInputs = [
-    qtdeclarative
     cups
     kconfig
     kconfigwidgets
     kdbusaddons
     kiconthemes
-    ki18n
     kcmutils
-    kio
     knotifications
-    plasma-framework
     kwidgetsaddons
-    kwindowsystem
     kitemviews
   ];
+  propagatedBuildInputs = [
+    ki18n
+    kio
+    kwindowsystem
+    plasma-framework
+    qtdeclarative
+  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/applications/misc/blender/default.nix

@@ -10,11 +10,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.76";
+  name = "blender-2.76b";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0daqirvlr0bwgrgrr7igyl8rcgjvpvrgns76z2z57kdxi6d696av";
+    sha256 = "0pb0mlj4vj0iir528ifqq67nsh3ca1942933d9cwlbpcja2jm1dx";
   };
 
   buildInputs =

pkgs/applications/misc/cool-retro-term/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }:
+{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }:
 
 stdenv.mkDerivation rec {
   version = "1.0.0";
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     sed -i -e '/qmltermwidget/d' cool-retro-term.pro
   '';
 
-  buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ];
+  buildInputs = [ qtbase qtquick1 qmltermwidget ];
+  nativeBuildInputs = [ makeQtWrapper ];
 
   configurePhase = "qmake PREFIX=$out";
 

pkgs/applications/office/calligra/default.nix

@@ -1,36 +1,32 @@
-{ stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
-, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2
-, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4
-, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular
-, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase
-, libodfgen, opencolorio, openjpeg, pstoedit, librevenge
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen
+, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
+, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
+, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
+, kactivities, okular, git
+# TODO: not found
+#, xbase, openjpeg
+# TODO: package libWPS, Spnav, m2mml, LibEtonyek
 }:
 
 stdenv.mkDerivation rec {
-  name = "calligra-2.8.7";
+  name = "calligra-2.9.8";
 
   src = fetchurl {
     url = "mirror://kde/stable/${name}/${name}.tar.xz";
-    sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg";
+    sha256 = "08a5k8gjmzp9yzq46xy0p1sw7dpvxmxh8zz6dyj8q1dq29719kkc";
   };
 
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
 
-# TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers
-# not found: xbase, openjpeg(too new)
-
   buildInputs = [
-    kdelibs attica zlib libpng boost mesa kdepimlibs
-    createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
-    sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl
-    shared_desktop_ontologies okular libodfgen opencolorio openjpeg
-    libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit
-    librevenge
+    kdelibs lcms2 libpng eigen
+    exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
+    libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
+    freetds fftw glew libkdcraw pstoedit opencolorio kdepimlibs
+    kactivities okular git
   ];
 
-  patches = [ ./librevenge.patch ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  enableParallelBuilding = true;
 
   meta = {
     description = "A suite of productivity applications";

pkgs/applications/office/calligra/librevenge.patch

@@ -1,882 +0,0 @@
-From 8e8f99cc314435f100d367f41c110becd19d3885 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 27 May 2014 16:15:52 +0200
-Subject: [PATCH] switch to librevenge-based import libs
-
----
- CMakeLists.txt                                  | 10 ++++++
- cmake/modules/FindLibEtonyek.cmake              |  6 ++--
- cmake/modules/FindLibOdfGen.cmake               |  6 ++--
- cmake/modules/FindLibRevenge.cmake              | 37 +++++++++++++++++++++
- cmake/modules/FindLibVisio.cmake                |  6 ++--
- cmake/modules/FindLibWpd.cmake                  | 22 +++----------
- cmake/modules/FindLibWpg.cmake                  |  6 ++--
- cmake/modules/FindLibWps.cmake                  |  6 ++--
- filters/flow/visio/import/CMakeLists.txt        |  3 +-
- filters/flow/visio/import/VSDXImport.cpp        |  9 ++---
- filters/flow/wpg/import/CMakeLists.txt          |  3 +-
- filters/flow/wpg/import/WPGImport.cpp           |  9 ++---
- filters/karbon/wpg/CMakeLists.txt               |  4 +--
- filters/karbon/wpg/WPGImport.cpp                | 39 ++++++++--------------
- filters/libodfhandler/DiskDocumentHandler.cxx   | 13 ++++----
- filters/libodfhandler/DiskDocumentHandler.hxx   |  8 ++---
- filters/libodfhandler/OutputFileHelper.cxx      |  6 ++--
- filters/libodfhandler/OutputFileHelper.hxx      |  9 ++---
- filters/libodfhandler/StdOutHandler.cxx         | 13 ++++----
- filters/libodfhandler/StdOutHandler.hxx         |  8 ++---
- filters/stage/keynote/import/CMakeLists.txt     |  5 +--
- filters/stage/keynote/import/KeyImport.cpp      | 15 +++++----
- filters/words/wordperfect/import/CMakeLists.txt |  3 +-
- filters/words/wordperfect/import/WPDImport.cpp  | 44 ++++++++++++++-----------
- filters/words/works/import/CMakeLists.txt       |  3 +-
- filters/words/works/import/WPSImport.cpp        | 18 +++++-----
- 26 files changed, 177 insertions(+), 134 deletions(-)
- create mode 100644 cmake/modules/FindLibRevenge.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b6b764..c337864 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -697,6 +697,16 @@ macro_optional_find_package(Okular)
- macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/" FALSE "" "Required to build the Okular OpenDocument Presenter plugin")
- 
- ##
-+## Test for librevenge
-+##
-+macro_optional_find_package(LibRevenge)
-+macro_log_feature(LIBREVENGE_FOUND "LibRevenge"
-+                  "A base library for writing document import filters"
-+                  "http://sf.net/p/libwpd/librevenge/" FALSE ""
-+                  "Required by various import filters"
-+)
-+
-+##
- ## Test for libodfgen
- ##
- macro_optional_find_package(LibOdfGen)
-diff --git a/cmake/modules/FindLibEtonyek.cmake b/cmake/modules/FindLibEtonyek.cmake
-index 5b78964..ad10d79 100644
---- a/cmake/modules/FindLibEtonyek.cmake
-+++ b/cmake/modules/FindLibEtonyek.cmake
-@@ -10,16 +10,16 @@
- 
- include(LibFindMacros)
- libfind_package(LIBETONYEK LibWpd)
--libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.0)
-+libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.1)
- 
- find_path(LIBETONYEK_INCLUDE_DIR
-     NAMES libetonyek/libetonyek.h
-     HINTS ${LIBETONYEK_PKGCONF_INCLUDE_DIRS} ${LIBETONYEK_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libetonyek-0.0
-+    PATH_SUFFIXES libetonyek-0.1
- )
- 
- find_library(LIBETONYEK_LIBRARY
--    NAMES etonyek etonyek-0.0
-+    NAMES etonyek etonyek-0.1
-     HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR}
- )
- 
-diff --git a/cmake/modules/FindLibOdfGen.cmake b/cmake/modules/FindLibOdfGen.cmake
-index 9ab80d1..355c345 100644
---- a/cmake/modules/FindLibOdfGen.cmake
-+++ b/cmake/modules/FindLibOdfGen.cmake
-@@ -9,16 +9,16 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- 
- include(LibFindMacros)
--libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.0)
-+libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.1)
- 
- find_path(LIBODFGEN_INCLUDE_DIR
-     NAMES libodfgen/libodfgen.hxx
-     HINTS ${LIBODFGEN_PKGCONF_INCLUDE_DIRS} ${LIBODFGEN_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libodfgen-0.0
-+    PATH_SUFFIXES libodfgen-0.1
- )
- 
- find_library(LIBODFGEN_LIBRARY
--    NAMES odfgen-0.0
-+    NAMES odfgen-0.1
-     HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR}
- )
- 
-diff --git a/cmake/modules/FindLibRevenge.cmake b/cmake/modules/FindLibRevenge.cmake
-new file mode 100644
-index 0000000..8ed18b1
---- /dev/null
-+++ b/cmake/modules/FindLibRevenge.cmake
-@@ -0,0 +1,37 @@
-+# - Try to find the librevenge
-+# Once done this will define
-+#
-+#  LIBREVENGE_FOUND - system has LIBREVENGE
-+#  LIBREVENGE_INCLUDE_DIRS - the LIBREVENGE include directory
-+#  LIBREVENGE_LIBRARIES - Link these to use LIBREVENGE
-+#  LIBREVENGE_DEFINITIONS - Compiler switches required for using LIBREVENGE
-+#
-+
-+include(LibFindMacros)
-+libfind_pkg_check_modules(REVENGE_PKGCONF librevenge-0.0)
-+
-+find_path(REVENGE_INCLUDE_DIR
-+    NAMES librevenge/librevenge.h
-+    HINTS ${REVENGE_PKGCONF_INCLUDE_DIRS} ${REVENGE_PKGCONF_INCLUDEDIR}
-+    PATH_SUFFIXES librevenge-0.0
-+)
-+
-+find_path(REVENGE_STREAM_INCLUDE_DIR
-+    NAMES librevenge-stream/librevenge-stream.h
-+    HINTS ${REVENGE_STREAM_PKGCONF_INCLUDE_DIRS} ${REVENGE_STREAM_PKGCONF_INCLUDEDIR}
-+    PATH_SUFFIXES librevenge-0.0
-+)
-+
-+find_library(REVENGE_LIBRARY
-+    NAMES revenge librevenge revenge-0.0 librevenge-0.0
-+    HINTS ${REVENGE_STREAM_PKGCONF_LIBRARY_DIRS} ${REVENGE_STREAM_PKGCONF_LIBDIR}
-+)
-+
-+find_library(REVENGE_STREAM_LIBRARY
-+    NAMES revenge-stream librevenge-stream revenge-stream-0.0 librevenge-stream-0.0
-+    HINTS ${REVENGE_PKGCONF_LIBRARY_DIRS} ${REVENGE_PKGCONF_LIBDIR}
-+)
-+
-+set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY)
-+set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR)
-+libfind_process(LIBREVENGE)
-diff --git a/cmake/modules/FindLibVisio.cmake b/cmake/modules/FindLibVisio.cmake
-index a8533ee..49871b3 100644
---- a/cmake/modules/FindLibVisio.cmake
-+++ b/cmake/modules/FindLibVisio.cmake
-@@ -12,16 +12,16 @@
- include(LibFindMacros)
- libfind_package(LIBWPD LibWpd)
- libfind_package(LIBWPG LibWpg)
--libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.0)
-+libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.1)
- 
- find_path(LIBVISIO_INCLUDE_DIR
-     NAMES libvisio/libvisio.h
-     HINTS ${LIBVISIO_PKGCONF_INCLUDE_DIRS} ${LIBVISIO_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libvisio-0.0
-+    PATH_SUFFIXES libvisio-0.1
- )
- 
- find_library(LIBVISIO_LIBRARY
--    NAMES visio visio-0.0
-+    NAMES visio visio-0.1
-     HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR}
- )
- 
-diff --git a/cmake/modules/FindLibWpd.cmake b/cmake/modules/FindLibWpd.cmake
-index 2a324cc..ed9bc26 100644
---- a/cmake/modules/FindLibWpd.cmake
-+++ b/cmake/modules/FindLibWpd.cmake
-@@ -8,31 +8,19 @@
- #
- 
- include(LibFindMacros)
--libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.9)
--libfind_pkg_check_modules(WPD_STREAM_PKGCONF libwpd-stream-0.9)
-+libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.10)
- 
- find_path(WPD_INCLUDE_DIR
-     NAMES libwpd/libwpd.h
-     HINTS ${WPD_PKGCONF_INCLUDE_DIRS} ${WPD_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwpd-0.9
--)
--
--find_path(WPD_STREAM_INCLUDE_DIR
--    NAMES libwpd-stream/libwpd-stream.h
--    HINTS ${WPD_STREAM_PKGCONF_INCLUDE_DIRS} ${WPD_STREAM_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwpd-0.9
-+    PATH_SUFFIXES libwpd-0.10
- )
- 
- find_library(WPD_LIBRARY
--    NAMES wpd libwpd wpd-0.9 libwpd-0.9
-+    NAMES wpd libwpd wpd-0.10 libwpd-0.10
-     HINTS ${WPD_PKGCONF_LIBRARY_DIRS} ${WPD_PKGCONF_LIBDIR}
- )
- 
--find_library(WPD_STREAM_LIBRARY
--    NAMES wpd-stream libwpd-stream wpd-stream-0.9 libwpd-stream-0.9
--    HINTS ${WPD_STREAM_PKGCONF_LIBRARY_DIRS} ${WPD_STREAM_PKGCONF_LIBDIR}
--)
--
--set(LIBWPD_PROCESS_LIBS WPD_LIBRARY WPD_STREAM_LIBRARY)
--set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR WPD_STREAM_INCLUDE_DIR)
-+set(LIBWPD_PROCESS_LIBS WPD_LIBRARY)
-+set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR)
- libfind_process(LIBWPD)
-diff --git a/cmake/modules/FindLibWpg.cmake b/cmake/modules/FindLibWpg.cmake
-index 56d9302..16c2a1c 100644
---- a/cmake/modules/FindLibWpg.cmake
-+++ b/cmake/modules/FindLibWpg.cmake
-@@ -11,16 +11,16 @@
- 
- include(LibFindMacros)
- libfind_package(LIBWPG LibWpd)
--libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.2)
-+libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.3)
- 
- find_path(LIBWPG_INCLUDE_DIR
-     NAMES libwpg/libwpg.h
-     HINTS ${LIBWPG_PKGCONF_INCLUDE_DIRS} ${LIBWPG_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwpg-0.2
-+    PATH_SUFFIXES libwpg-0.3
- )
- 
- find_library(LIBWPG_LIBRARY
--    NAMES wpg wpg-0.2
-+    NAMES wpg wpg-0.3
-     HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR}
- )
- 
-diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
-index 149f34c..f8c8225 100644
---- a/cmake/modules/FindLibWps.cmake
-+++ b/cmake/modules/FindLibWps.cmake
-@@ -10,16 +10,16 @@
- 
- include(LibFindMacros)
- libfind_package(LIBWPS LibWpd)
--libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.2)
-+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
- 
- find_path(LIBWPS_INCLUDE_DIR
-     NAMES libwps/libwps.h
-     HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwps-0.2
-+    PATH_SUFFIXES libwps-0.3
- )
- 
- find_library(LIBWPS_LIBRARY
--    NAMES wps wps-0.2
-+    NAMES wps wps-0.3
-     HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
- )
- 
-diff --git a/filters/flow/visio/import/CMakeLists.txt b/filters/flow/visio/import/CMakeLists.txt
-index 1de4385..4c2a391 100644
---- a/filters/flow/visio/import/CMakeLists.txt
-+++ b/filters/flow/visio/import/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(
-     ../../../libodfhandler/
-     ${LIBODFGEN_INCLUDE_DIRS}
-+    ${LIBREVENGE_INCLUDE_DIRS}
-     ${LIBVISIO_INCLUDE_DIRS}
-     ${KOMAIN_INCLUDES}
- )
-@@ -15,7 +16,7 @@ set(vsdx2odg_PART_SRCS
- 
- kde4_add_plugin(calligra_filter_vsdx2odg ${vsdx2odg_PART_SRCS})
- 
--target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBVISIO_LIBRARIES})
-+target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBVISIO_LIBRARIES})
- 
- install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/flow/visio/import/VSDXImport.cpp b/filters/flow/visio/import/VSDXImport.cpp
-index 70a54d9..eb3a208 100644
---- a/filters/flow/visio/import/VSDXImport.cpp
-+++ b/filters/flow/visio/import/VSDXImport.cpp
-@@ -17,7 +17,7 @@
- #include "VSDXImport.h"
- 
- #include <libvisio/libvisio.h>
--#include <libodfgen/OdgGenerator.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #include "OutputFileHelper.hxx"
- #include <KoFilterChain.h>
-@@ -39,7 +39,7 @@ public:
-     ~OdgOutputFileHelper() {}
- 
- private:
--    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
-+    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
-     {
-         if (!libvisio::VisioDocument::isSupported(input))
-         {
-@@ -49,9 +49,10 @@ private:
-         return true;
-     }
- 
--    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
-+    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
-     {
--        OdgGenerator exporter(handler, streamType);
-+        OdgGenerator exporter;
-+        exporter.addDocumentHandler(handler, streamType);
-         return libvisio::VisioDocument::parse(input, &exporter);
-     }
- };
-diff --git a/filters/flow/wpg/import/CMakeLists.txt b/filters/flow/wpg/import/CMakeLists.txt
-index 524d1b1..e2ee2a5 100644
---- a/filters/flow/wpg/import/CMakeLists.txt
-+++ b/filters/flow/wpg/import/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(
-     ../../../libodfhandler/
-     ${LIBODFGEN_INCLUDE_DIRS}
-+    ${LIBREVENGE_INCLUDE_DIRS}
-     ${LIBVISIO_INCLUDE_DIRS}
-     ${KOMAIN_INCLUDES}
- )
-@@ -15,7 +16,7 @@ set(wpg2odg_PART_SRCS
- 
- kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS})
- 
--target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBWPG_LIBRARIES})
-+target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPG_LIBRARIES})
- 
- install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/flow/wpg/import/WPGImport.cpp b/filters/flow/wpg/import/WPGImport.cpp
-index b4e0fa7..563ae6e 100644
---- a/filters/flow/wpg/import/WPGImport.cpp
-+++ b/filters/flow/wpg/import/WPGImport.cpp
-@@ -17,7 +17,7 @@
- #include "WPGImport.h"
- 
- #include <libwpg/libwpg.h>
--#include <libodfgen/OdgGenerator.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #include "OutputFileHelper.hxx"
- #include <KoFilterChain.h>
-@@ -39,7 +39,7 @@ public:
-     ~OdgOutputFileHelper() {}
- 
- private:
--    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
-+    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
-     {
-         if (!libwpg::WPGraphics::isSupported(input))
-         {
-@@ -49,9 +49,10 @@ private:
-         return true;
-     }
- 
--    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
-+    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
-     {
--        OdgGenerator exporter(handler, streamType);
-+        OdgGenerator exporter;
-+        exporter.addDocumentHandler(handler, streamType);
-         return libwpg::WPGraphics::parse(input, &exporter);
-     }
- };
-diff --git a/filters/karbon/wpg/CMakeLists.txt b/filters/karbon/wpg/CMakeLists.txt
-index 5f578e9..ffa7742 100644
---- a/filters/karbon/wpg/CMakeLists.txt
-+++ b/filters/karbon/wpg/CMakeLists.txt
-@@ -1,11 +1,11 @@
- 
--include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
-+include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBREVENGE_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
- 
- set(wpg2svg_PART_SRCS WPGImport.cpp)
- 
- kde4_add_plugin(calligra_filter_wpg2svg ${wpg2svg_PART_SRCS})
- 
--target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${LIBWPD_LIBRARIES})
-+target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBREVENGE_LIBRARIES})
- 
- install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/karbon/wpg/WPGImport.cpp b/filters/karbon/wpg/WPGImport.cpp
-index f1852ee..4457bec 100644
---- a/filters/karbon/wpg/WPGImport.cpp
-+++ b/filters/karbon/wpg/WPGImport.cpp
-@@ -32,14 +32,12 @@
- #include <QString>
- #include <QFile>
- 
-+#include <librevenge/librevenge.h>
-+#include <librevenge-stream/librevenge-stream.h>
-+
- #include <libwpg/libwpg.h>
--#if LIBWPG_VERSION_MINOR<2
--#include <libwpg/WPGStreamImplementation.h>
--#else
--#include <libwpd-stream/libwpd-stream.h>
--#include <libwpd/libwpd.h>
--#endif
- 
-+#include <cassert>
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -63,39 +61,29 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
-     if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
--#if LIBWPG_VERSION_MINOR<2
--    WPXInputStream* input = new libwpg::WPGFileStream(m_chain->inputFile().toLocal8Bit());
--    if (input->isOLEStream()) {
--        WPXInputStream* olestream = input->getDocumentOLEStream();
--        if (olestream) {
--            delete input;
--            input = olestream;
--        }
--    }
--    libwpg::WPGString output;
--#else
--    WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
--    if (input->isOLEStream()) {
--        WPXInputStream* olestream = input->getDocumentOLEStream("Anything");
-+    librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(m_chain->inputFile().toLocal8Bit());
-+    if (input->isStructured()) {
-+        librevenge::RVNGInputStream* olestream = input->getSubStreamByName("Anything");
-         if (olestream) {
-             delete input;
-             input = olestream;
-         }
-      }
--     ::WPXString output;
--#endif
--
-     if (!libwpg::WPGraphics::isSupported(input)) {
-         kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
-         delete input;
-         return KoFilter::NotImplemented;
-     }
- 
--    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+     ::librevenge::RVNGStringVector output;
-+     librevenge::RVNGSVGDrawingGenerator generator(output, "");
-+
-+    if (!libwpg::WPGraphics::parse(input, &generator)) {
-         kWarning() << "ERROR: SVG Generation failed!";
-         delete input;
-         return KoFilter::ParsingError;
-     }
-+    assert(1 == output.size());
- 
-     delete input;
- 
-@@ -104,7 +92,8 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
-         kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-         return KoFilter::InternalError;
-     }
--    outputFile.write(output.cstr());
-+    outputFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
-+    outputFile.write(output[0].cstr());
-     outputFile.close();
- 
-     return KoFilter::OK;
-diff --git a/filters/libodfhandler/DiskDocumentHandler.cxx b/filters/libodfhandler/DiskDocumentHandler.cxx
-index e035fdc..f8ca273 100644
---- a/filters/libodfhandler/DiskDocumentHandler.cxx
-+++ b/filters/libodfhandler/DiskDocumentHandler.cxx
-@@ -37,7 +37,7 @@ DiskOdfDocumentHandler::DiskOdfDocumentHandler(FemtoZip *pOutput) :
- {
- }
- 
--void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
-+void DiskOdfDocumentHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
- {
- 	if (mbIsTagOpened)
- 	{
-@@ -46,11 +46,11 @@ void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyL
- 	}
- 	PUTSTRING("<");
- 	PUTSTRING(psName);
--	WPXPropertyList::Iter i(xPropList);
-+	librevenge::RVNGPropertyList::Iter i(xPropList);
- 	for (i.rewind(); i.next(); )
- 	{
--		// filter out libwpd elements
--		if (strncmp(i.key(), "libwpd", 6) != 0)
-+		// filter out librevenge properties
-+		if (strncmp(i.key(), "librevenge", 10) != 0)
- 		{
- 			PUTSTRING(" ");
- 			PUTSTRING(i.key());
-@@ -91,14 +91,15 @@ void DiskOdfDocumentHandler::endElement(const char *psName)
- 	}
- }
- 
--void DiskOdfDocumentHandler::characters(const WPXString &sCharacters)
-+void DiskOdfDocumentHandler::characters(const librevenge::RVNGString &sCharacters)
- {
- 	if (mbIsTagOpened)
- 	{
- 		PUTSTRING(">");
- 		mbIsTagOpened = false;
- 	}
--	WPXString sEscapedCharacters(sCharacters, true);
-+	librevenge::RVNGString sEscapedCharacters;
-+	sEscapedCharacters.appendEscapedXML(sCharacters);
- 	if (sEscapedCharacters.len() > 0)
- 		PUTSTRING(sEscapedCharacters.cstr());
- }
-diff --git a/filters/libodfhandler/DiskDocumentHandler.hxx b/filters/libodfhandler/DiskDocumentHandler.hxx
-index 17f7eb7..d52a256 100644
---- a/filters/libodfhandler/DiskDocumentHandler.hxx
-+++ b/filters/libodfhandler/DiskDocumentHandler.hxx
-@@ -23,7 +23,7 @@
- #ifndef _DISKDOCUMENTHANDLER_H
- #define _DISKDOCUMENTHANDLER_H
- 
--#include <libodfgen/OdfDocumentHandler.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-@@ -45,9 +45,9 @@ public:
- #endif
- 	virtual void startDocument() {}
- 	virtual void endDocument();
--	virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
-+	virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
- 	virtual void endElement(const char *psName);
--	virtual void characters(const WPXString &sCharacters);
-+	virtual void characters(const librevenge::RVNGString &sCharacters);
- 
- private:
- 	DiskOdfDocumentHandler(DiskOdfDocumentHandler const &);
-@@ -58,7 +58,7 @@ private:
- 	FemtoZip *mpOutput;
- #endif
- 	bool mbIsTagOpened;
--	WPXString msOpenedTagName;
-+	librevenge::RVNGString msOpenedTagName;
- };
- #endif
- 
-diff --git a/filters/libodfhandler/OutputFileHelper.cxx b/filters/libodfhandler/OutputFileHelper.cxx
-index 8786d4c..61e48e9 100644
---- a/filters/libodfhandler/OutputFileHelper.cxx
-+++ b/filters/libodfhandler/OutputFileHelper.cxx
-@@ -37,7 +37,7 @@
- 
- #include "DiskDocumentHandler.hxx"
- #include "StdOutHandler.hxx"
--#include <libwpd-stream/WPXStreamImplementation.h>
-+#include <librevenge-stream/librevenge-stream.h>
- 
- struct OutputFileHelperImpl
- {
-@@ -197,12 +197,12 @@ bool OutputFileHelper::writeChildFile(const char *childFileName, const char *str
- 
- bool OutputFileHelper::writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType)
- {
--	WPXFileStream input(inFileName);
-+	librevenge::RVNGFileStream input(inFileName);
- 
- 	if (!_isSupportedFormat(&input, m_impl->mpPassword))
- 		return false;
- 
--	input.seek(0, WPX_SEEK_SET);
-+	input.seek(0, librevenge::RVNG_SEEK_SET);
- 
- 	OdfDocumentHandler *pHandler;
- #ifdef USE_GSF_OUTPUT
-diff --git a/filters/libodfhandler/OutputFileHelper.hxx b/filters/libodfhandler/OutputFileHelper.hxx
-index a61b9a0..d2632a9 100644
---- a/filters/libodfhandler/OutputFileHelper.hxx
-+++ b/filters/libodfhandler/OutputFileHelper.hxx
-@@ -22,9 +22,10 @@
- #ifndef _OUTPUTFILEHELPER_HXX
- #define _OUTPUTFILEHELPER_HXX
- 
--#include <libodfgen/OdfDocumentHandler.hxx>
-+#include <libodfgen/libodfgen.hxx>
-+
-+#include <librevenge-stream/librevenge-stream.h>
- 
--class WPXInputStream;
- struct OutputFileHelperImpl;
- 
- class OutputFileHelper
-@@ -38,8 +39,8 @@ public:
- 	bool writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType);
- 
- private:
--	virtual bool _isSupportedFormat(WPXInputStream *input, const char *password) = 0;
--	virtual bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
-+	virtual bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password) = 0;
-+	virtual bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
- 	OutputFileHelperImpl *m_impl;
- 
- private:
-diff --git a/filters/libodfhandler/StdOutHandler.cxx b/filters/libodfhandler/StdOutHandler.cxx
-index 6864266..16e19f0 100644
---- a/filters/libodfhandler/StdOutHandler.cxx
-+++ b/filters/libodfhandler/StdOutHandler.cxx
-@@ -31,7 +31,7 @@ StdOutHandler::StdOutHandler() :
- 	printf("<?xml version=\"1.0\"?>\n");
- }
- 
--void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
-+void StdOutHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
- {
- 	if (mbIsTagOpened)
- 	{
-@@ -39,11 +39,11 @@ void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPro
- 		mbIsTagOpened = false;
- 	}
- 	printf("<%s", psName);
--	WPXPropertyList::Iter i(xPropList);
-+	librevenge::RVNGPropertyList::Iter i(xPropList);
- 	for (i.rewind(); i.next(); )
- 	{
--		// filter out libwpd elements
--		if (strncmp(i.key(), "libwpd", 6) != 0)
-+		// filter out librevenge properties
-+		if (strncmp(i.key(), "librevenge", 10) != 0)
- 			printf(" %s=\"%s\"", i.key(), i()->getStr().cstr());
- 	}
- 	mbIsTagOpened = true;
-@@ -73,15 +73,14 @@ void StdOutHandler::endElement(const char *psName)
- 	}
- }
- 
--void StdOutHandler::characters(const WPXString &sCharacters)
-+void StdOutHandler::characters(const librevenge::RVNGString &sCharacters)
- {
- 	if (mbIsTagOpened)
- 	{
- 		printf(">");
- 		mbIsTagOpened = false;
- 	}
--	WPXString sEscapedCharacters(sCharacters, true);
--	printf("%s", sEscapedCharacters.cstr());
-+	printf("%s", librevenge::RVNGString::escapeXML(sCharacters).cstr());
- }
- 
- void StdOutHandler::endDocument()
-diff --git a/filters/libodfhandler/StdOutHandler.hxx b/filters/libodfhandler/StdOutHandler.hxx
-index a18189a..44fa1e7 100644
---- a/filters/libodfhandler/StdOutHandler.hxx
-+++ b/filters/libodfhandler/StdOutHandler.hxx
-@@ -23,7 +23,7 @@
- #ifndef _STDOUTHANDLER_H
- #define _STDOUTHANDLER_H
- 
--#include <libodfgen/OdfDocumentHandler.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- class StdOutHandler : public OdfDocumentHandler
- {
-@@ -31,12 +31,12 @@ public:
- 	StdOutHandler();
- 	virtual void startDocument() {}
- 	virtual void endDocument();
--	virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
-+	virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
- 	virtual void endElement(const char *psName);
--	virtual void characters(const WPXString &sCharacters);
-+	virtual void characters(const librevenge::RVNGString &sCharacters);
- private:
- 	bool mbIsTagOpened;
--	WPXString msOpenedTagName;
-+	librevenge::RVNGString msOpenedTagName;
- };
- #endif
- 
-diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt
-index 6a0e2d7..ffb3c70 100644
---- a/filters/words/wordperfect/import/CMakeLists.txt
-+++ b/filters/words/wordperfect/import/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(
-     ../../../libodfhandler/
-     ${LIBODFGEN_INCLUDE_DIRS}
-+    ${LIBREVENGE_INCLUDE_DIRS}
-     ${LIBWPD_INCLUDE_DIRS}
-     ${LIBWPG_INCLUDE_DIRS}
-     ${KOMAIN_INCLUDES}
-@@ -17,7 +18,7 @@ set(wpd2odt_PART_SRCS
- kde4_add_plugin(calligra_filter_wpd2odt ${wpd2odt_PART_SRCS})
- 
- target_link_libraries(calligra_filter_wpd2odt
--    komain ${LIBODFGEN_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
-+    komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
- 
- install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR})
- 
-diff --git a/filters/words/wordperfect/import/WPDImport.cpp b/filters/words/wordperfect/import/WPDImport.cpp
-index af9d9b6..edf1c91 100644
---- a/filters/words/wordperfect/import/WPDImport.cpp
-+++ b/filters/words/wordperfect/import/WPDImport.cpp
-@@ -18,8 +18,7 @@
- 
- #include <libwpd/libwpd.h>
- #include <libwpg/libwpg.h>
--#include <libodfgen/OdtGenerator.hxx>
--#include <libodfgen/OdgGenerator.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #include <OutputFileHelper.hxx>
- #include <KoFilterChain.h>
-@@ -31,6 +30,7 @@
- #include <QString>
- #include <QByteArray>
- 
-+#include <cassert>
- #include <stdio.h>
- 
- class OdtOutputFileHelper : public OutputFileHelper
-@@ -41,20 +41,20 @@ public:
-     ~OdtOutputFileHelper() {};
- 
- private:
--    bool _isSupportedFormat(WPXInputStream *input, const char *password)
-+    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password)
-     {
--        WPDConfidence confidence = WPDocument::isFileFormatSupported(input);
--        if (WPD_CONFIDENCE_EXCELLENT != confidence && WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
-+        libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(input);
-+        if (libwpd::WPD_CONFIDENCE_EXCELLENT != confidence && libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
-         {
-             fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n");
-             return false;
-         }
--        if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
-+        if (libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
-         {
-             fprintf(stderr, "ERROR: The WordPerfect document is encrypted and you did not give us a password.\n");
-             return false;
-         }
--        if (confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (WPD_PASSWORD_MATCH_OK != WPDocument::verifyPassword(input, password)))
-+        if (confidence == libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (libwpd::WPD_PASSWORD_MATCH_OK != libwpd::WPDocument::verifyPassword(input, password)))
-         {
-             fprintf(stderr, "ERROR: The WordPerfect document is encrypted and we either\n");
-             fprintf(stderr, "ERROR: don't know how to decrypt it or the given password is wrong.\n");
-@@ -64,41 +64,47 @@ private:
-         return true;
-     }
- 
--    static bool handleEmbeddedWPGObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
-+    static bool handleEmbeddedWPGObject(const librevenge::RVNGBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
-     {
--        OdgGenerator exporter(pHandler, streamType);
-+        OdgGenerator exporter;
-+        exporter.addDocumentHandler(pHandler, streamType);
- 
-         libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
- 
--        if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(data.getDataStream())))
-+        if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(data.getDataStream())))
-             fileFormat = libwpg::WPG_WPG1;
- 
--        return libwpg::WPGraphics::parse(const_cast<WPXInputStream *>(data.getDataStream()), &exporter, fileFormat);
-+        return libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(data.getDataStream()), &exporter, fileFormat);
-     }
- 
--    static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData &output)
-+    static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, librevenge::RVNGBinaryData &output)
-     {
--        WPXString svgOutput;
-         libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
- 
--        if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(input.getDataStream())))
-+        if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(input.getDataStream())))
-             fileFormat = libwpg::WPG_WPG1;
- 
--        if (!libwpg::WPGraphics::generateSVG(const_cast<WPXInputStream *>(input.getDataStream()), svgOutput, fileFormat))
-+        librevenge::RVNGStringVector svgOutput;
-+        librevenge::RVNGSVGDrawingGenerator generator(svgOutput, "");
-+        if (!libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(input.getDataStream()), &generator, fileFormat))
-             return false;
-+        assert(1 == svgOutput.size());
- 
-         output.clear();
--        output.append((unsigned char *)svgOutput.cstr(), strlen(svgOutput.cstr()));
-+        const librevenge::RVNGString svgPrefix("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
-+        output.append((unsigned char *)svgPrefix.cstr(), svgPrefix.size());
-+        output.append((unsigned char *)svgOutput[0].cstr(), svgOutput[0].size());
- 
-         return true;
-     }
- 
--    bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
-+    bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
-     {
--        OdtGenerator collector(handler, streamType);
-+        OdtGenerator collector;
-+        collector.addDocumentHandler(handler, streamType);
-         collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject);
-         collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage);
--        if (WPD_OK == WPDocument::parse(input, &collector, password))
-+        if (libwpd::WPD_OK == libwpd::WPDocument::parse(input, &collector, password))
-             return true;
-         return false;
-     }
-diff --git a/filters/words/works/import/CMakeLists.txt b/filters/words/works/import/CMakeLists.txt
-index 76317ae..2c51937 100644
---- a/filters/words/works/import/CMakeLists.txt
-+++ b/filters/words/works/import/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(
-     ../../../libodfhandler/
-     ${LIBODFGEN_INCLUDE_DIRS}
-+    ${LIBREVENGE_INCLUDE_DIRS}
-     ${LIBWPS_INCLUDE_DIRS}
-     ${KOMAIN_INCLUDES}
- )
-@@ -15,7 +16,7 @@ set(wps2odt_PART_SRCS
- 
- kde4_add_plugin(calligra_filter_wps2odt ${wps2odt_PART_SRCS})
- 
--target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBWPS_LIBRARIES})
-+target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPS_LIBRARIES})
- 
- install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp
-index c2058e5..545daf3 100644
---- a/filters/words/works/import/WPSImport.cpp
-+++ b/filters/words/works/import/WPSImport.cpp
-@@ -16,9 +16,9 @@
- 
- #include "WPSImport.h"
- 
--#include <libwpd/libwpd.h>
-+#include <librevenge/librevenge.h>
- #include <libwps/libwps.h>
--#include <libodfgen/OdtGenerator.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #include "OutputFileHelper.hxx"
- #include <KoFilterChain.h>
-@@ -40,10 +40,11 @@ public:
-     ~OdtOutputFileHelper() {};
- 
- private:
--    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
-+    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
-     {
--        WPSConfidence confidence = WPSDocument::isFileFormatSupported(input);
--        if (confidence == WPS_CONFIDENCE_NONE || confidence == WPS_CONFIDENCE_POOR)
-+        libwps::WPSKind kind = libwps::WPS_TEXT;
-+        libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(input, kind);
-+        if ((libwps::WPS_TEXT != kind) || (confidence != libwps::WPS_CONFIDENCE_EXCELLENT))
-         {
-             fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Microsoft Works document.\n");
-             return false;
-@@ -52,10 +53,11 @@ private:
-         return true;
-     }
- 
--    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
-+    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
-     {
--        OdtGenerator collector(handler, streamType);
--        if (WPS_OK == WPSDocument::parse(input, &collector))
-+        OdtGenerator collector;
-+        collector.addDocumentHandler(handler, streamType);
-+        if (libwps::WPS_OK == libwps::WPSDocument::parse(input, &collector))
-             return true;
-         return false;
-     }
--- 
-1.9.3
-
-

pkgs/applications/office/homebank/default.nix

@@ -1,8 +1,9 @@
-{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool }:
+{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
+, hicolor_icon_theme}:
 
 let
    download_root = "http://homebank.free.fr/public/";
-   name = "homebank-5.0.0";
+   name = "homebank-5.0.6";
    lastrelease = download_root + name + ".tar.gz";
    oldrelease = download_root + "old/" + name + ".tar.gz";
 in
@@ -12,10 +13,10 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [ lastrelease oldrelease ];
-    sha256 = "062r61ryn2v1sxyw6zymhxnvnhk19wsr4nyzmiiwx5wrk0nk9m18";
+    sha256 = "1r1rn8lgnqnlwkspx230gly5f4i90ij0a3ddrvw51kdc41xfylja";
   };
 
-  buildInputs = [ pkgconfig gtk libofx intltool ];
+  buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme wrapGAppsHook ];
 
   meta = {
     description = "Free, easy, personal accounting for everyone";

pkgs/applications/video/vlc/default.nix

@@ -6,7 +6,7 @@
 , mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
-, libvdpau, libsamplerate
+, libvdpau, libsamplerate, live555
 , onlyLibVLC ? false
 , qt4 ? null
 , withQt5 ? false, qtbase ? null
@@ -34,13 +34,15 @@ stdenv.mkDerivation rec {
       udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
-      libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
+      libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
     ]
     ++ [(if withQt5 then qtbase else qt4)]
     ++ optional jackSupport libjack2;
 
   nativeBuildInputs = [ pkgconfig ];
 
+  LIVE555_PREFIX = live555;
+
   configureFlags =
     [ "--enable-alsa"
       "--with-kde-solid=$out/share/apps/solid/actions"

pkgs/applications/virtualization/openstack/glance.nix

@@ -56,6 +56,8 @@ pythonPackages.buildPythonPackage rec {
           $i --help
       esac
     done
+
+    cp etc/*-paste.ini $out/etc/
   '';
 
   meta = with stdenv.lib; {

pkgs/applications/virtualization/openstack/keystone.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pythonPackages, xmlsec, which }:
+{ stdenv, fetchurl, pythonPackages, xmlsec, which, openssl }:
 
 pythonPackages.buildPythonPackage rec {
   name = "keystone-${version}";
@@ -33,7 +33,13 @@ pythonPackages.buildPythonPackage rec {
     ldap ldappool webtest requests2 oslotest pep8 pymongo which
   ];
 
+  makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"];
+
   postInstall = ''
+    # install .ini files
+    mkdir -p $out/etc
+    cp etc/* $out/etc
+
     # check all binaries don't crash
     for i in $out/bin/*; do
       $i --help

pkgs/applications/virtualization/openstack/nova.nix

@@ -12,6 +12,11 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "175n1znvmy8f5vqvabc2fa4qy8y17685z4gzpq8984mdsdnpv21w";
   };
 
+  # otherwise migrate.cfg is not installed
+  patchPhase = ''
+    echo "graft nova" >> MANIFEST.in
+  '';
+
   # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
     pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography

pkgs/data/fonts/hack/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip }:
 
-let version = "2.015"; in
+let version = "2.017"; in
 stdenv.mkDerivation {
   name = "hack-font-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     version_ = with stdenv.lib;
       concatStringsSep "_" (splitString "." version);
   in fetchurl {
-    sha256 = "0x0c3wwxiidl5a6axbcwizxny5q2yc6l4724smdj4gmn1xa137g5";
+    sha256 = "1bspjdllmwbb7bs5rcdghyvvl4xf3pw5nss1z3zxc805pysxyy0c";
     url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
   };
 

pkgs/desktops/plasma-5.3/default.nix

@@ -1,258 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ pkgs, newScope, kdeApps ? null, kf5 ? null, qt5 ? null, debug ? false }:
-
-let inherit (pkgs) autonix stdenv symlinkJoin; in
-
-with autonix; let inherit (stdenv) lib; in
-
-let
-  kdeApps_ = if kdeApps != null then kdeApps else pkgs.kdeApps_15_04;
-  kf5_ = if kf5 != null then kf5 else pkgs.kf510;
-  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
-in
-
-let
-
-  kdeApps = kdeApps_.override { inherit debug kf5 qt5; plasma5 = self; };
-  kf5 = kf5_.override { inherit debug qt5; };
-  qt5 = qt5_;
-
-  kdePackage = name: pkg:
-    let defaultOverride = drv: drv // {
-          setupHook = ./setup-hook.sh;
-          cmakeFlags =
-            (drv.cmakeFlags or [])
-            ++ [ "-DBUILD_TESTING=OFF" ]
-            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-          meta = {
-            license = with stdenv.lib.licenses; [
-              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-            ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-          };
-        };
-        callPackage = newScope {
-          inherit (stdenv) mkDerivation;
-          inherit (pkgs) fetchurl;
-          inherit scope;
-        };
-    in mkPackage callPackage defaultOverride name pkg;
-
-  super =
-    let json = builtins.fromJSON (builtins.readFile ./packages.json);
-        mirrorUrl = n: pkg: pkg // {
-          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
-        };
-        renames =
-          (builtins.fromJSON (builtins.readFile ./kf5-renames.json))
-          // (builtins.fromJSON (builtins.readFile ./renames.json));
-        propagated = [ "extra-cmake-modules" ];
-        native = [
-          "bison"
-          "extra-cmake-modules"
-          "flex"
-          "kdoctools"
-          "ki18n"
-          "libxslt"
-          "perl"
-          "pythoninterp"
-        ];
-        user = [
-          "qt5"
-          "qt5core"
-          "qt5dbus"
-          "qt5gui"
-          "qt5qml"
-          "qt5quick"
-          "qt5svg"
-          "qt5webkitwidgets"
-          "qt5widgets"
-          "qt5x11extras"
-          "shareddesktopontologies"
-          "sharedmimeinfo"
-        ];
-    in lib.fold (f: attrs: f attrs) json [
-      (lib.mapAttrs kdePackage)
-      (userEnvDeps user)
-      (nativeDeps native)
-      (propagateDeps propagated)
-      (renameDeps renames)
-      (lib.mapAttrs mirrorUrl)
-    ];
-
-  scope =
-    # KDE Frameworks 5
-    kf5 //
-    # packages in this collection
-    self //
-    # packages pinned to this version of Qt 5
-    {
-      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
-      libbluedevil = pkgs.libbluedevil.override { inherit qt5; };
-      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      polkitqt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
-      poppler_qt5 = pkgs.poppler_qt5.override { inherit qt5; };
-      qt5 = qt5.base;
-      qt5core = qt5.base;
-      qt5dbus = qt5.base;
-      qt5gui = qt5.base;
-      qt5linguisttools = qt5.tools;
-      qt5qml = [qt5.declarative qt5.graphicaleffects];
-      qt5quick = [qt5.quickcontrols qt5.graphicaleffects];
-      qt5script = qt5.script;
-      qt5svg = qt5.svg;
-      qt5tools = qt5.tools;
-      qt5webkitwidgets = qt5.webkit;
-      qt5widgets = qt5.base;
-      qt5x11extras = qt5.x11extras;
-      qt5xmlpatterns = qt5.xmlpatterns;
-    } //
-    # packages from nixpkgs
-    (with pkgs; {
-      inherit attr bash cairo cmake coreutils dbus epoxy exiv2 ffmpeg
-              freetype glib gnugrep gnused gtk2 gtk3 libinput libssh
-              modemmanager openconnect openexr pam pango qt4 samba
-              socat substituteAll taglib utillinux wayland xapian
-              xkeyboard_config xorg;
-      boost = boost155;
-      canberra = libcanberra;
-      epub = ebook_tools;
-      fontforge_executable = fontforge;
-      mobilebroadbandproviderinfo = mobile_broadband_provider_info;
-      mtp = libmtp;
-      pulseaudio = libpulseaudio;
-      qalculate = libqalculate;
-      shareddesktopontologies = shared_desktop_ontologies;
-      sharedmimeinfo = shared_mime_info;
-      usb = libusb;
-    });
-
-  self = super // {
-
-    bluez-qt = overrideDerivation super.bluez-qt (drv: {
-      preConfigure = ''
-        substituteInPlace CMakeLists.txt \
-          --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
-      '';
-    });
-
-    breeze =
-      let
-        version = (builtins.parseDrvName super.breeze.name).version;
-
-        breeze-qt4 = overrideDerivation super.breeze (drv: {
-          name = "breeze-qt4-${version}";
-          buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ];
-          nativeBuildInputs = [ pkgs.automoc4 scope.cmake pkgs.pkgconfig ];
-          cmakeFlags = [
-            "-DUSE_KDE4=ON"
-            "-DQT_QMAKE_EXECUTABLE=${scope.qt4}/bin/qmake"
-          ];
-        });
-
-        breeze-qt5 = overrideDerivation super.breeze (drv: {
-          name = "breeze-qt5-${version}";
-          buildInputs = with kf5; with self; [
-            kcompletion kconfig kconfigwidgets kcoreaddons kdecoration
-            kguiaddons frameworkintegration ki18n kwindowsystem qt5.base
-            qt5.x11extras
-          ];
-          nativeBuildInputs = [ scope.cmake kf5.extra-cmake-modules pkgs.pkgconfig ];
-          cmakeFlags = [ "-DUSE_KDE4=OFF" ];
-        });
-      in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
-
-    kde-gtk-config = extendDerivation super.kde-gtk-config {
-      NIX_CFLAGS_COMPILE = with scope;
-        lib.concatStringsSep " " [
-          "-I${cairo}/include/cairo"
-          "-I${gtk2}/include/gtk-2.0"
-          "-I${gtk2}/lib/gtk-2.0/include"
-          "-I${glib}/include/glib-2.0"
-          "-I${glib}/lib/glib-2.0/include"
-          "-I${pango}/include/pango-1.0"
-        ];
-    };
-
-    kfilemetadata = extendDerivation super.kfilemetadata {
-      buildInputs = [ scope.attr ];
-    };
-
-    kwin = extendDerivation super.kwin {
-      buildInputs = with scope.xorg; [ libICE libSM libXcursor ];
-      patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
-    };
-
-    libkscreen = extendDerivation super.libkscreen {
-      buildInputs = [ scope.xorg.libXrandr];
-    };
-
-    plasma-desktop = extendDerivation super.plasma-desktop {
-      buildInputs = with scope;
-        [ canberra ]
-        ++ (with xorg; [ libxkbfile libXcursor libXft ]);
-      patches = [
-        (scope.substituteAll {
-          src = ./plasma-desktop/plasma-desktop-hwclock.patch;
-          hwclock = "${scope.utillinux}/sbin/hwclock";
-        })
-        ./plasma-desktop/plasma-desktop-zoneinfo.patch
-        (scope.substituteAll {
-          src = ./plasma-desktop/plasma-desktop-xkb-rules.patch;
-          xkb = scope.xkeyboard_config;
-        })
-      ];
-      NIX_CFLAGS_COMPILE = with scope.xorg;
-        lib.concatStringsSep " " [
-          "-I${xf86inputsynaptics}/include/xorg"
-          "-I${xf86inputevdev}/include/xorg"
-          "-I${xorgserver}/include/xorg"
-        ];
-      cmakeFlags = with scope.xorg; [
-        "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include"
-        "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include"
-      ];
-    };
-
-    plasma-workspace = extendDerivation super.plasma-workspace {
-      patches = [ ./plasma-workspace/0001-startkde-NixOS-patches.patch ];
-      buildInputs = with scope.xorg; [ libSM libXcursor scope.pam ];
-
-      inherit (scope) bash coreutils gnused gnugrep socat;
-      inherit (scope) kconfig kinit kservice qt5tools;
-      inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-      dbus_tools = scope.dbus.tools;
-      kde_workspace = kdeApps.kde-workspace;
-      postPatch = ''
-        substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-          --replace kdostartupconfig5 $out/bin/kdostartupconfig5
-        substituteAllInPlace startkde/startkde.cmake
-      '';
-    };
-
-    powerdevil = extendDerivation super.powerdevil {
-      buildInputs = [ scope.xorg.libXrandr ];
-    };
-
-    sddm-kcm = extendDerivation super.sddm-kcm {
-      buildInputs = [ scope.xorg.libXcursor ];
-    };
-
-  };
-
-in self

pkgs/desktops/plasma-5.3/kf5-renames.json

@@ -1,70 +0,0 @@
-{
-    "kf5widgetsaddons": "kwidgetsaddons",
-    "kf5texteditor": "ktexteditor",
-    "kf5designerplugin": "kdesignerplugin",
-    "kf5bookmarks": "kbookmarks",
-    "kf5frameworkintegration": "frameworkintegration",
-    "kf5package": "kpackage",
-    "kf5archive": "karchive",
-    "kf5plasma": "plasma-framework",
-    "kf5kcmutils": "kcmutils",
-    "kf5configwidgets": "kconfigwidgets",
-    "ctest": "attica",
-    "kf5kio": "kio",
-    "kf5networkmanagerqt": "networkmanager-qt",
-    "kf5coreaddons": "kcoreaddons",
-    "kf5guiaddons": "kguiaddons",
-    "kf5jobwidgets": "kjobwidgets",
-    "kf5modemmanagerqt": "modemmanager-qt",
-    "kf5runner": "krunner",
-    "kf5globalaccel": "kglobalaccel",
-    "kf5dbusaddons": "kdbusaddons",
-    "kf5crash": "kcrash",
-    "kf5itemviews": "kitemviews",
-    "kf5doctools": "kdoctools",
-    "kf5i18n": "ki18n",
-    "kf5webkit": "kdewebkit",
-    "kf5newstuff": "knewstuff",
-    "kded": "kded",
-    "kf5notifications": "knotifications",
-    "kf5activitiesexperimentalstats": "kactivities",
-    "kf5dnssd": "kdnssd",
-    "kf5notifyconfig": "knotifyconfig",
-    "kf5iconthemes": "kiconthemes",
-    "kf5js": "kjs",
-    "kf5kde4support": "kdelibs4support",
-    "kf5parts": "kparts",
-    "backend": "plasma-framework",
-    "kf5completion": "kcompletion",
-    "kf5threadweaver": "threadweaver",
-    "kf5mediaplayer": "kmediaplayer",
-    "kf5plasmaquick": "plasma-framework",
-    "kf5wallet": "kwallet",
-    "kf5xmlgui": "kxmlgui",
-    "kf5attica": "attica",
-    "kf5declarative": "kdeclarative",
-    "kf5config": "kconfig",
-    "kf5init": "kinit",
-    "kf5textwidgets": "ktextwidgets",
-    "kf5jsembed": "kjsembed",
-    "kf5codecs": "kcodecs",
-    "kf5service": "kservice",
-    "kf5sonnet": "sonnet",
-    "kf5kdelibs4support": "kdelibs4support",
-    "kf5pty": "kpty",
-    "kf5solid": "solid",
-    "kf5auth": "kauth",
-    "ecm": "extra-cmake-modules",
-    "kf5activities": "kactivities",
-    "kf5plotting": "kplotting",
-    "kf5people": "kpeople",
-    "kf5emoticons": "kemoticons",
-    "kf5kross": "kross",
-    "kf5su": "kdesu",
-    "kf5khtml": "khtml",
-    "kf5unitconversion": "kunitconversion",
-    "kf5idletime": "kidletime",
-    "kf5windowsystem": "kwindowsystem",
-    "kf5xmlrpcclient": "kxmlrpcclient",
-    "kf5itemmodels": "kitemmodels"
-}

pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch

@@ -1,13 +0,0 @@
-diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
-index 26b44a9..d14e226 100644
---- a/clients/aurorae/src/aurorae.cpp
-+++ b/clients/aurorae/src/aurorae.cpp
-@@ -73,7 +73,7 @@ void AuroraeFactory::init()
-     // so let's try to locate our plugin:
-     QString pluginPath;
-     for (const QString &path : m_engine->importPathList()) {
--        QDirIterator it(path, QDirIterator::Subdirectories);
-+        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             it.next();
-             QFileInfo fileInfo = it.fileInfo();

pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch

@@ -1,25 +0,0 @@
-commit a93a2ab1918630c6d571b5a24379c15a0458d1fa
-Author: Martin Gräßlin <mgraesslin@kde.org>
-Date:   Wed Jan 28 16:20:57 2015 +0100
-
-    Disable libinput integration if >= 0.8 is found
-    
-    libinput 0.8 is incompatible causing the build to fail. As we are in
-    dependency freeze the only option is to disable the build.
-    
-    BUG: 342893
-    FIXED-IN: 5.2.1
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 550ef57..8d9c593 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES  URL "http://www.freedesktop.org/software
-                                         PURPOSE "Required for input handling on Wayland."
-                         )
- set(HAVE_INPUT FALSE)
--if (Libinput_FOUND AND UDEV_FOUND)
-+if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8)
-     set(HAVE_INPUT TRUE)
- endif()
- 

pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch

@@ -1,130 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 460022f..422a708 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
- 
-+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
-+
- set(libkscreen_SRCS
-     backendloader.cpp
-     config.cpp
-diff --git a/src/backendloader.cpp b/src/backendloader.cpp
-index b93e469..8aebc14 100644
---- a/src/backendloader.cpp
-+++ b/src/backendloader.cpp
-@@ -16,6 +16,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA       *
-  *************************************************************************************/
- 
-+#include "config-libkscreen.h"
- #include "backendloader.h"
- #include "debug_p.h"
- #include "backends/abstractbackend.h"
-@@ -40,55 +41,54 @@ bool BackendLoader::init()
-     const QString backend = qgetenv("KSCREEN_BACKEND").constData();
-     const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
- 
--    const QStringList paths = QCoreApplication::libraryPaths();
--    Q_FOREACH (const QString &path, paths) {
--        const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
--                       backendFilter,
--                       QDir::SortFlags(QDir::QDir::NoSort),
--                       QDir::NoDotAndDotDot | QDir::Files);
--        const QFileInfoList finfos = dir.entryInfoList();
--        Q_FOREACH (const QFileInfo &finfo, finfos) {
--            // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
--            if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
--                continue;
--            }
-+    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
- 
--            // When on X11, skip the QScreen backend, instead use the XRandR backend,
--            // if not specified in KSCREEN_BACKEND
--            if (backend.isEmpty() &&
--                    finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
--                    QX11Info::isPlatformX11()) {
--                continue;
--            }
-+    const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
-+                   backendFilter,
-+                   QDir::SortFlags(QDir::QDir::NoSort),
-+                   QDir::NoDotAndDotDot | QDir::Files);
-+    const QFileInfoList finfos = dir.entryInfoList();
-+    Q_FOREACH (const QFileInfo &finfo, finfos) {
-+        // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
-+        if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
-+            continue;
-+        }
- 
--            // When not on X11, skip the XRandR backend, and fall back to QSCreen
--            // if not specified in KSCREEN_BACKEND
--            if (backend.isEmpty() &&
--                    finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
--                    !QX11Info::isPlatformX11()) {
--                continue;
--            }
-+        // When on X11, skip the QScreen backend, instead use the XRandR backend,
-+        // if not specified in KSCREEN_BACKEND
-+        if (backend.isEmpty() &&
-+                finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
-+                QX11Info::isPlatformX11()) {
-+            continue;
-+        }
-+
-+        // When not on X11, skip the XRandR backend, and fall back to QSCreen
-+        // if not specified in KSCREEN_BACKEND
-+        if (backend.isEmpty() &&
-+                finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
-+                !QX11Info::isPlatformX11()) {
-+            continue;
-+        }
- 
--            QPluginLoader loader(finfo.filePath());
--            loader.load();
--            QObject *instance = loader.instance();
--            if (!instance) {
-+        QPluginLoader loader(finfo.filePath());
-+        loader.load();
-+        QObject *instance = loader.instance();
-+        if (!instance) {
-+            loader.unload();
-+            continue;
-+        }
-+
-+        s_backend = qobject_cast< AbstractBackend* >(instance);
-+        if (s_backend) {
-+            if (!s_backend->isValid()) {
-+                qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
-+                delete s_backend;
-+                s_backend = 0;
-                 loader.unload();
-                 continue;
-             }
--
--            s_backend = qobject_cast< AbstractBackend* >(instance);
--            if (s_backend) {
--                if (!s_backend->isValid()) {
--                    qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
--                    delete s_backend;
--                    s_backend = 0;
--                    loader.unload();
--                    continue;
--                }
--                qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
--                return true;
--            }
-+            qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
-+            return true;
-         }
-     }
- 
-diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
-new file mode 100644
-index 0000000..a99f3d1
---- /dev/null
-+++ b/src/config-libkscreen.h.cmake
-@@ -0,0 +1,2 @@
-+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
-+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"

pkgs/desktops/plasma-5.3/manifest.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
-KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
-
-# The extra slash at the end of the URL is necessary to stop wget
-# from recursing over the whole server! (No, it's not a bug.)
-$(nix-build ../../.. -A autonix.manifest) \
-    "${KDE_MIRROR}/stable/plasma/5.3.1/" \
-    $MANIFEST_EXTRA_ARGS -A '*.tar.xz'

pkgs/desktops/plasma-5.3/packages.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -x
-
-origin="$(pwd)"
-
-# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
-KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
-
-alias nix-build="nix-build --no-out-link \"$origin/../../..\""
-
-# The extra slash at the end of the URL is necessary to stop wget
-# from recursing over the whole server! (No, it's not a bug.)
-$(nix-build -A autonix.manifest) \
-    "${KDE_MIRROR}/stable/plasma/5.3.2/" \
-    "$@" -A '*.tar.xz'
-
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
-
-$AUTONIX_DEPS_KF5 manifest.json
-
-rm manifest.json

pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch

@@ -1,24 +0,0 @@
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index cec5ab8..fc4a6b9 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -48,10 +48,6 @@
- #include <sys/stat.h>
- #endif
- 
--// We cannot rely on the $PATH environment variable, because D-Bus activation
--// clears it. So we have to use a reasonable default.
--static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
--
- int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
- {
-     int ret = 0;
-@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
- 
- void ClockHelper::toHwclock()
- {
--    QString hwclock = KStandardDirs::findExe("hwclock", exePath);
-+    QString hwclock = "@hwclock@";
-     if (!hwclock.isEmpty()) {
-         KProcess::execute(hwclock, QStringList() << "--systohc");
-     }

pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-xkb-rules.patch

@@ -1,47 +0,0 @@
-From 3f175a5ecc9b4fecd8fe25cb482cf2c91aa47cf6 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 4 May 2015 22:23:21 -0500
-Subject: [PATCH] xkb rules path
-
----
- kcms/keyboard/xkb_rules.cpp | 24 +-----------------------
- 1 file changed, 1 insertion(+), 23 deletions(-)
-
-diff --git a/kcms/keyboard/xkb_rules.cpp b/kcms/keyboard/xkb_rules.cpp
-index 341369d..27066d6 100644
---- a/kcms/keyboard/xkb_rules.cpp
-+++ b/kcms/keyboard/xkb_rules.cpp
-@@ -157,29 +157,7 @@ QString Rules::getRulesName()
- 
- QString Rules::findXkbDir()
- {
--	QString xkbParentDir;
--
--	QString base(XLIBDIR);
--	if( base.count('/') >= 3 ) {
--		// .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /usr/X11/share/X11/xkb
--		QString delta = base.endsWith("X11") ? "/../../share/X11" : "/../share/X11";
--		QDir baseDir(base + delta);
--		if( baseDir.exists() ) {
--			xkbParentDir = baseDir.absolutePath();
--		}
--		else {
--			QDir baseDir(base + "/X11");	// .../usr/X11/lib/X11/xkb (old XFree)
--			if( baseDir.exists() ) {
--				xkbParentDir = baseDir.absolutePath();
--			}
--		}
--	}
--
--	if( xkbParentDir.isEmpty() ) {
--		xkbParentDir = "/usr/share/X11";
--	}
--
--	return xkbParentDir + "/xkb";
-+	return "@xkb@/share/X11/xkb";
- }
- 
- static QString findXkbRulesFile()
--- 
-2.3.6
-

pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch

@@ -1,18 +0,0 @@
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index fc4a6b9..7b64d05 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
- 
-     val = selectedzone;
- #else
--    QString tz = "/usr/share/zoneinfo/" + selectedzone;
-+    // NixOS-specific path
-+    QString tz = "/etc/zoneinfo/" + selectedzone;
-+    if (!QFile::exists(tz)) {
-+      // Standard Linux path
-+      tz = "/usr/share/zoneinfo/" + selectedzone;
-+    }
- 
-     if (QFile::exists(tz)) { // make sure the new TZ really exists
-         QFile::remove("/etc/localtime");

pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch

@@ -1,411 +0,0 @@
-From f124d2204cff11ae0ff0d6c788d268b746180407 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 18 Jul 2015 12:13:08 -0500
-Subject: [PATCH] startkde NixOS patches
-
----
- startkde/startkde.cmake | 222 ++++++++++++++++++++----------------------------
- 1 file changed, 91 insertions(+), 131 deletions(-)
-
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 6f93108..26cc2fc 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -1,8 +1,31 @@
--#!/bin/sh
-+#!@bash@/bin/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
-+    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-+fi
-+
- if test "x$1" = x--failsafe; then
-     KDE_FAILSAFE=1 # General failsafe flag
-     KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -16,29 +39,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
-+@out@/bin/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@/bin/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:
-@@ -56,13 +66,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=$(@qt5tools@/bin/qtpaths --writable-path GenericConfigLocation)
-+mkdir -p "$configDir"
- 
- #This is basically setting defaults so we can use them with kstartupconfig5
- cat >$configDir/startupconfigkeys <<EOF
-@@ -106,55 +111,21 @@ toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0
- 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="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@"
--
--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="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@/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@/bin/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
- 
--if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
--    export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
--fi
-+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/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"
-+    @kde_workspace@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-     if test $? -eq 10; then
-         XCURSOR_THEME=breeze_cursors
-         export XCURSOR_THEME
-@@ -168,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
-     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@/bin/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_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
-+fi
-+if @qt5tools@/bin/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@/bin/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)
-       ;;
-@@ -205,8 +194,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=$(@qt5tools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
- 
- # Add /env/ to the directory to locate the scripts to be sourced
- for prefix in `echo $scriptpath`; do
-@@ -216,7 +204,7 @@ for prefix in `echo $scriptpath`; do
- done
- 
- # Set the path for Qt plugins provided by KDE
--QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
-+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5tools@/bin/qtpaths --plugin-dir`
- # TODO: Do we really need this?
- QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
- export QT_PLUGIN_PATH
-@@ -242,7 +230,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" | @gnused@/bin/sed -e 's/:.*//'`
-   sys_odir=$kdedirs_first/share/fonts/override
-   sys_fdir=$kdedirs_first/share/fonts
- else
-@@ -255,23 +243,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@/bin/xset +fp "$sys_odir"
-+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
-+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
-+test -d "$sys_fdir" && @xset@/bin/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@/bin/xset fp rehash
- 
- # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
- if test -n "$GS_LIB" ; then
-@@ -284,30 +262,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
--# 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
--
--
- # 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
-@@ -332,11 +286,11 @@ fi
- #
- KDE_FULL_SESSION=true
- export KDE_FULL_SESSION
--xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-+@xprop@/bin/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@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
- 
- KDE_SESSION_UID=`id -ru`
- export KDE_SESSION_UID
-@@ -346,30 +300,36 @@ 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@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
- fi
- 
--# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-+# At this point all environment variables are set, let's send it to the DBus
-+# session server to update the activation environment
- @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv
- 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@/bin/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 @kinit@/lib/libexec/kf5/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@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation"
-   exit 1
- 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!
-+@kservice@/bin/kbuildsycoca5
-+
- # finally, give the session control to the session manager
- # see kdebase/ksmserver for the description of the rest of the startup sequence
- # if the KDEWM environment variable has been set, then it will be used as KDE's
-@@ -385,27 +345,27 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
- # lock now and do the rest of the KDE startup underneath the locker.
- KSMSERVEROPTIONS=""
- test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
--kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
-+@kinit@/bin/kwrapper5 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@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
- fi
- 
--wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
-+wait_drkonqi=`@kconfig@/bin/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=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-     wait_drkonqi_counter=0
--    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-+    while @qt5tools@/bin/qdbus | @gnugrep@/bin/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"
-+            @qt5tools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
-+                @qt5tools@/bin/qdbus "$address" "/MainApplication" "quit"
-             done
-             break
-         fi
-@@ -417,21 +377,21 @@ echo 'startkde: Shutting down...'  1>&2
- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- 
- # Clean up
--kdeinit5_shutdown
-+@kinit@/bin/kdeinit5_shutdown
- 
- echo 'startkde: Running shutdown scripts...'  1>&2
- 
- # Run scripts found in <config locations>/plasma-workspace/shutdown
- for prefix in `echo "$scriptpath"`; do
--  for file in `ls "$prefix"/shutdown 2> /dev/null | egrep -v '(~|\.bak)$'`; do
-+  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
-     test -x "$prefix/shutdown/$file" && "$prefix/shutdown/$file"
-   done
- done
- 
- unset KDE_FULL_SESSION
--xprop -root -remove KDE_FULL_SESSION
-+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--xprop -root -remove KDE_SESSION_VERSION
-+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
- unset KDE_SESSION_UID
- 
- echo 'startkde: Done.'  1>&2
--- 
-2.4.5
-

pkgs/desktops/plasma-5.3/renames.json

@@ -1,20 +0,0 @@
-{
-    "kf5sysguard": "libksysguard",
-    "kf5baloo": "baloo",
-    "krunnerappdbusinterface": "plasma-workspace",
-    "screensaverdbusinterface": "plasma-workspace",
-    "ctest": "kdeplasma-addons",
-    "kf5filemetadata": "kfilemetadata",
-    "kwindbusinterface": "kwin",
-    "kf5activitiesexperimentalstats": "plasma-desktop",
-    "khotkeysdbusinterface": "khotkeys",
-    "libkworkspace": "plasma-workspace",
-    "libtaskmanager": "plasma-workspace",
-    "backend": "powerdevil",
-    "kf5screen": "libkscreen",
-    "ksmserverdbusinterface": "plasma-workspace",
-    "kf5wayland": "kwayland",
-    "kdecoration2": "kdecoration",
-    "kf5bluezqt": "bluez-qt",
-    "oxygenfont": "oxygen-fonts"
-}

pkgs/desktops/plasma-5.3/setup-hook.sh

@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share

pkgs/desktops/plasma-5.4/bluedevil.nix

@@ -1,39 +1,23 @@
-{ plasmaPackage
-, extra-cmake-modules
-, bluez-qt
-, kcoreaddons
-, kdbusaddons
-, kded
-, ki18n
-, kiconthemes
-, kio
-, knotifications
-, kwidgetsaddons
-, kwindowsystem
-, plasma-framework
-, qtdeclarative
-, shared_mime_info
+{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons
+, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications
+, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework
+, qtdeclarative, shared_mime_info
 }:
 
 plasmaPackage {
   name = "bluedevil";
-  nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
+  nativeBuildInputs = [
+    extra-cmake-modules makeQtWrapper shared_mime_info
+  ];
   buildInputs = [
-    bluez-qt
-    kcoreaddons
-    kdbusaddons
-    kded
-    ki18n
-    kiconthemes
-    kio
-    knotifications
+    kcoreaddons kdbusaddons kded kiconthemes knotifications
     kwidgetsaddons
-    kwindowsystem
-    plasma-framework
-    qtdeclarative
+  ];
+  propagatedBuildInputs = [
+    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/bluedevil-wizard"
-    wrapKDEProgram "$out/bin/bluedevil-sendfile"
+    wrapQtProgram "$out/bin/bluedevil-wizard"
+    wrapQtProgram "$out/bin/bluedevil-sendfile"
   '';
 }

pkgs/desktops/plasma-5.4/breeze-qt5.nix

@@ -1,14 +1,6 @@
-{ plasmaPackage
-, extra-cmake-modules
-, frameworkintegration
-, kcmutils
-, kconfigwidgets
-, kcoreaddons
-, kdecoration
-, kguiaddons
-, ki18n
-, kwindowsystem
-, qtx11extras
+{ plasmaPackage, extra-cmake-modules, frameworkintegration
+, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
+, ki18n, kwindowsystem, makeQtWrapper, qtx11extras
 }:
 
 plasmaPackage {
@@ -16,20 +8,14 @@ plasmaPackage {
   sname = "breeze";
   nativeBuildInputs = [
     extra-cmake-modules
+    makeQtWrapper
   ];
   buildInputs = [
-    frameworkintegration
-    kcmutils
-    kconfigwidgets
-    kcoreaddons
-    kdecoration
-    kguiaddons
-    ki18n
-    kwindowsystem
-    qtx11extras
+    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
   ];
-  cmakeFlags = [ "-DUSE_KDE4=OFF" ];
+  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
+  cmakeFlags = [ "-DUSE_Qt4=OFF" ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/breeze-settings5"
+    wrapQtProgram "$out/bin/breeze-settings5"
   '';
 }

pkgs/desktops/plasma-5.4/default.nix

@@ -51,7 +51,7 @@ let
       let version = (builtins.parseDrvName breeze-qt5.name).version;
       in symlinkJoin "breeze-${version}" [ breeze-qt4 breeze-qt5 ];
     kde-cli-tools = callPackage ./kde-cli-tools.nix {};
-    kde-gtk-config = callPackage ./kde-gtk-config.nix {};
+    kde-gtk-config = callPackage ./kde-gtk-config {};
     kdecoration = callPackage ./kdecoration.nix {};
     kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
     kgamma5 = callPackage ./kgamma5.nix {};
@@ -66,13 +66,13 @@ let
     kwin = callPackage ./kwin {};
     kwrited = callPackage ./kwrited.nix {};
     libkscreen = callPackage ./libkscreen {};
-    libksysguard = callPackage ./libksysguard.nix {};
+    libksysguard = callPackage ./libksysguard {};
     milou = callPackage ./milou.nix {};
     oxygen = callPackage ./oxygen.nix {};
     oxygen-fonts = callPackage ./oxygen-fonts.nix {};
     plasma-desktop = callPackage ./plasma-desktop {};
     plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
-    plasma-nm = callPackage ./plasma-nm.nix {};
+    plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {};
     plasma-workspace = callPackage ./plasma-workspace {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};

pkgs/desktops/plasma-5.4/kde-cli-tools.nix

@@ -1,41 +1,27 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kcmutils
-, kconfig
-, kdelibs4support
-, kdesu
-, kdoctools
-, ki18n
-, kiconthemes
-, kwindowsystem
-, qtsvg
-, qtx11extras
+{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
+, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
+, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras
 }:
 
 plasmaPackage {
   name = "kde-cli-tools";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
-    kcmutils
-    kconfig
-    kdelibs4support
-    kdesu
-    ki18n
-    kiconthemes
-    kwindowsystem
-    qtsvg
-    qtx11extras
+    kcmutils kconfig kdesu kiconthemes
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kmimetypefinder5"
-    wrapKDEProgram "$out/bin/ksvgtopng5"
-    wrapKDEProgram "$out/bin/ktraderclient5"
-    wrapKDEProgram "$out/bin/kioclient5"
-    wrapKDEProgram "$out/bin/kdecp5"
-    wrapKDEProgram "$out/bin/keditfiletype5"
-    wrapKDEProgram "$out/bin/kcmshell5"
-    wrapKDEProgram "$out/bin/kdemv5"
-    wrapKDEProgram "$out/bin/kstart5"
-    wrapKDEProgram "$out/bin/kde-open5"
+    wrapQtProgram "$out/bin/kmimetypefinder5"
+    wrapQtProgram "$out/bin/ksvgtopng5"
+    wrapQtProgram "$out/bin/ktraderclient5"
+    wrapQtProgram "$out/bin/kioclient5"
+    wrapQtProgram "$out/bin/kdecp5"
+    wrapQtProgram "$out/bin/keditfiletype5"
+    wrapQtProgram "$out/bin/kcmshell5"
+    wrapQtProgram "$out/bin/kdemv5"
+    wrapQtProgram "$out/bin/kstart5"
+    wrapQtProgram "$out/bin/kde-open5"
   '';
 }

pkgs/desktops/plasma-5.4/kde-gtk-config/0001-follow-symlinks.patch

@@ -0,0 +1,39 @@
+From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Tue, 27 Oct 2015 18:07:54 -0500
+Subject: [PATCH] follow symlinks
+
+---
+ src/appearancegtk2.cpp  | 2 +-
+ src/iconthemesmodel.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
+index b1e0b52..095cddc 100644
+--- a/src/appearancegtk2.cpp
++++ b/src/appearancegtk2.cpp
+@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
+     QStringList themes=installedThemes();
+     themes=themes.filter(QRegExp("/"+themeName+"/?$"));
+     if(themes.size()==1) {
+-        QDirIterator it(themes.first(), QDirIterator::Subdirectories);
++        QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while(it.hasNext()) {
+             it.next();
+             if(it.fileName()=="gtkrc") {
+diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
+index 07c7ad7..b04d978 100644
+--- a/src/iconthemesmodel.cpp
++++ b/src/iconthemesmodel.cpp
+@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
+     
+     foreach(const QString& dir, dirs) {
+         QDir userIconsDir(dir);
+-        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
++        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
+         while(it.hasNext()) {
+             QString currentPath = it.next();
+             QDir dir(currentPath);
+-- 
+2.6.2
+

pkgs/desktops/plasma-5.4/kde-gtk-config/default.nix

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

pkgs/desktops/plasma-5.4/kdeplasma-addons.nix

@@ -1,22 +1,7 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, ibus
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kcmutils
-, kdelibs4support
-, ki18n
-, kio
-, knewstuff
-, kross
-, krunner
-, kservice
-, kunitconversion
-, plasma-framework
-, qtdeclarative
-, qtx11extras
+{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
+, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
+, kio, knewstuff, kross, krunner, kservice, kunitconversion
+, plasma-framework, qtdeclarative, qtx11extras
 }:
 
 plasmaPackage {
@@ -26,21 +11,11 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    ibus
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcmutils
-    kdelibs4support
-    ki18n
-    kio
-    knewstuff
-    kross
-    krunner
-    kservice
-    kunitconversion
-    plasma-framework
-    qtdeclarative
+    ibus kconfig kconfigwidgets kcoreaddons kcmutils
+    knewstuff kservice kunitconversion
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support kio kross krunner plasma-framework qtdeclarative
     qtx11extras
   ];
 }

pkgs/desktops/plasma-5.4/kgamma5.nix

@@ -1,18 +1,9 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kdelibs4support
+{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
 , qtx11extras
 }:
 
 plasmaPackage {
   name = "kgamma5";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kdelibs4support
-    qtx11extras
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
 }

pkgs/desktops/plasma-5.4/khelpcenter.nix

@@ -1,15 +1,6 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kconfig
-, kcoreaddons
-, kdbusaddons
-, ki18n
-, kinit
-, kcmutils
-, kdelibs4support
-, khtml
-, kservice
+{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
+, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
+, khtml, kservice, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -17,19 +8,13 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    kinit
-    kcmutils
-    kdelibs4support
-    khtml
-    kservice
+    kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
   ];
+  propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/khelpcenter"
+    wrapQtProgram "$out/bin/khelpcenter"
   '';
 }

pkgs/desktops/plasma-5.4/khotkeys.nix

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

pkgs/desktops/plasma-5.4/kinfocenter.nix

@@ -1,24 +1,8 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kcmutils
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdbusaddons
-, kdeclarative
-, kdelibs4support
-, ki18n
-, kiconthemes
-, kio
-, kpackage
-, kservice
-, kwidgetsaddons
-, kxmlgui
-, libraw1394
-, pciutils
-, solid
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
+, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
+, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper
+, pciutils, solid
 }:
 
 plasmaPackage {
@@ -26,28 +10,15 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    kcmutils
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kdeclarative
-    kdelibs4support
-    ki18n
-    kiconthemes
-    kio
-    kpackage
-    kservice
-    kwidgetsaddons
-    kxmlgui
-    libraw1394
-    pciutils
-    solid
+    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
+    kdbusaddons kiconthemes kpackage kservice kwidgetsaddons
+    kxmlgui libraw1394 pciutils solid
   ];
+  propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kinfocenter"
+    wrapQtProgram "$out/bin/kinfocenter"
   '';
 }

pkgs/desktops/plasma-5.4/kmenuedit.nix

@@ -1,13 +1,5 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, ki18n
-, kxmlgui
-, kdbusaddons
-, kiconthemes
-, kio
-, sonnet
-, kdelibs4support
+{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
+, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -15,17 +7,13 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    ki18n
-    kxmlgui
-    kdbusaddons
-    kiconthemes
-    kio
-    sonnet
-    kdelibs4support
+    kxmlgui kdbusaddons kiconthemes
   ];
+  propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kmenuedit"
+    wrapQtProgram "$out/bin/kmenuedit"
   '';
 }

pkgs/desktops/plasma-5.4/kscreen.nix

@@ -1,33 +1,19 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kconfig
-, kconfigwidgets
-, kdbusaddons
-, kglobalaccel
-, ki18n
-, kwidgetsaddons
-, kxmlgui
-, libkscreen
-, qtdeclarative
+{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
+, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
+, libkscreen, makeQtWrapper, qtdeclarative
 }:
 
 plasmaPackage {
   name = "kscreen";
   nativeBuildInputs = [
     extra-cmake-modules
+    makeQtWrapper
   ];
   buildInputs = [
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kglobalaccel
-    ki18n
-    kwidgetsaddons
-    kxmlgui
-    libkscreen
-    qtdeclarative
+    kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
   ];
+  propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kscreen-console"
+    wrapQtProgram "$out/bin/kscreen-console"
   '';
 }

pkgs/desktops/plasma-5.4/ksshaskpass.nix

@@ -1,25 +1,13 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kcoreaddons
-, ki18n
-, kwallet
-, kwidgetsaddons
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
+, ki18n, kwallet, kwidgetsaddons, makeQtWrapper
 }:
 
 plasmaPackage {
   name = "ksshaskpass";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kwallet
-    kwidgetsaddons
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
+  propagatedBuildInputs = [ ki18n ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/ksshaskpass"
+    wrapQtProgram "$out/bin/ksshaskpass"
   '';
 }

pkgs/desktops/plasma-5.4/ksysguard.nix

@@ -1,14 +1,6 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kconfig
-, kcoreaddons
-, kdelibs4support
-, ki18n
-, kitemviews
-, knewstuff
-, kiconthemes
-, libksysguard
+{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
+, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
+, kiconthemes, libksysguard, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -16,19 +8,14 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    kconfig
-    kcoreaddons
-    kdelibs4support
-    ki18n
-    kitemviews
-    knewstuff
-    kiconthemes
-    libksysguard
+    kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
   ];
+  propagatedBuildInputs = [ kdelibs4support ki18n ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/ksysguardd"
-    wrapKDEProgram "$out/bin/ksysguard"
+    wrapQtProgram "$out/bin/ksysguardd"
+    wrapQtProgram "$out/bin/ksysguard"
   '';
 }

pkgs/desktops/plasma-5.4/kwin/0001-qdiriterator-follow-symlinks.patch

@@ -1,8 +1,17 @@
+From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 07:05:22 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ clients/aurorae/src/aurorae.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
-index 26b44a9..d14e226 100644
+index 781c960..ad5f420 100644
 --- a/clients/aurorae/src/aurorae.cpp
 +++ b/clients/aurorae/src/aurorae.cpp
-@@ -73,7 +73,7 @@ void AuroraeFactory::init()
+@@ -211,7 +211,7 @@ void Helper::init()
      // so let's try to locate our plugin:
      QString pluginPath;
      for (const QString &path : m_engine->importPathList()) {
@@ -11,3 +20,6 @@ index 26b44a9..d14e226 100644
          while (it.hasNext()) {
              it.next();
              QFileInfo fileInfo = it.fileInfo();
+-- 
+2.5.2
+

pkgs/desktops/plasma-5.4/kwin/default.nix

@@ -1,39 +1,11 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, epoxy
-, kactivities
-, kcompletion
-, kcmutils
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kcrash
-, kdeclarative
-, kdecoration
-, kglobalaccel
-, ki18n
-, kiconthemes
-, kinit
-, kio
-, knewstuff
-, knotifications
-, kpackage
-, kservice
-, kwayland
-, kwidgetsaddons
-, kwindowsystem
-, kxmlgui
-, libinput
-, libICE
-, libSM
-, plasma-framework
-, qtdeclarative
-, qtscript
-, qtx11extras
-, udev
-, wayland
-, xcb-util-cursor
+{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy
+, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
+, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
+, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications
+, kpackage, kservice, kwayland, kwidgetsaddons, kwindowsystem
+, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
+, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
+, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -41,45 +13,21 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    epoxy
-    kactivities
-    kcompletion
-    kcmutils
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcrash
-    kdeclarative
-    kdecoration
-    kglobalaccel
-    ki18n
-    kiconthemes
-    kinit
-    kio
-    knewstuff
-    knotifications
-    kpackage
-    kservice
-    kwayland
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    libinput
-    libICE
-    libSM
-    plasma-framework
-    qtdeclarative
-    qtscript
-    qtx11extras
-    udev
-    wayland
-    xcb-util-cursor
+    epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
+    kcrash kdecoration kiconthemes kinit knewstuff knotifications
+    kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
+    libSM qtscript udev wayland xcb-util-cursor
   ];
-  patches = [ ./kwin-import-plugin-follow-symlinks.patch ];
+  propagatedBuildInputs = [
+    kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem
+    plasma-framework qtdeclarative qtmultimedia qtx11extras
+  ];
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kwin_x11"
-    wrapKDEProgram "$out/bin/kwin_wayland"
+    wrapQtProgram "$out/bin/kwin_x11"
+    wrapQtProgram "$out/bin/kwin_wayland"
   '';
 }

pkgs/desktops/plasma-5.4/kwin/libinput-0.8.patch

@@ -1,25 +0,0 @@
-commit a93a2ab1918630c6d571b5a24379c15a0458d1fa
-Author: Martin Gräßlin <mgraesslin@kde.org>
-Date:   Wed Jan 28 16:20:57 2015 +0100
-
-    Disable libinput integration if >= 0.8 is found
-    
-    libinput 0.8 is incompatible causing the build to fail. As we are in
-    dependency freeze the only option is to disable the build.
-    
-    BUG: 342893
-    FIXED-IN: 5.2.1
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 550ef57..8d9c593 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -145,7 +145,7 @@ set_package_properties(UDev PROPERTIES  URL "http://www.freedesktop.org/software
-                                         PURPOSE "Required for input handling on Wayland."
-                         )
- set(HAVE_INPUT FALSE)
--if (Libinput_FOUND AND UDEV_FOUND)
-+if (Libinput_FOUND AND UDEV_FOUND AND Libinput_VERSION VERSION_LESS 0.8)
-     set(HAVE_INPUT TRUE)
- endif()
- 

pkgs/desktops/plasma-5.4/kwrited.nix

@@ -1,22 +1,10 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kcoreaddons
-, ki18n
-, kpty
-, knotifications
-, kdbusaddons
+{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
+, knotifications, kdbusaddons
 }:
 
 plasmaPackage {
   name = "kwrited";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kpty
-    knotifications
-    kdbusaddons
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
+  propagatedBuildInputs = [ ki18n ];
 }

pkgs/desktops/plasma-5.4/libkscreen/default.nix

@@ -11,6 +11,8 @@ plasmaPackage {
   ];
   buildInputs = [
     libXrandr
+  ];
+  propagatedBuildInputs = [
     qtx11extras
   ];
 }

pkgs/desktops/plasma-5.4/libksysguard.nix

@@ -1,42 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kauth
-, kcompletion
-, kconfigwidgets
-, kcoreaddons
-, kservice
-, kwidgetsaddons
-, kwindowsystem
-, plasma-framework
-, qtscript
-, qtwebkit
-, qtx11extras
-, kconfig
-, ki18n
-, kiconthemes
-}:
-
-plasmaPackage {
-  name = "libksysguard";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kauth
-    kcompletion
-    kconfigwidgets
-    kcoreaddons
-    kservice
-    kwidgetsaddons
-    kwindowsystem
-    plasma-framework
-    qtscript
-    qtwebkit
-    qtx11extras
-  ];
-  propagatedBuildInputs = [
-    kconfig
-    ki18n
-    kiconthemes
-  ];
-}

pkgs/desktops/plasma-5.4/libksysguard/0001-qdiriterator-follow-symlinks.patch

@@ -0,0 +1,25 @@
+From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 07:07:22 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ processui/scripting.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp
+index efed8ff..841761a 100644
+--- a/processui/scripting.cpp
++++ b/processui/scripting.cpp
+@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() {
+     QStringList scripts;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "ksysguard/scripts/", QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString& dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             scripts.append(it.next());
+         }
+-- 
+2.5.2
+

pkgs/desktops/plasma-5.4/libksysguard/default.nix

@@ -0,0 +1,21 @@
+{ plasmaPackage, extra-cmake-modules, kauth, kcompletion
+, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
+, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras
+, kconfig, ki18n, kiconthemes
+}:
+
+plasmaPackage {
+  name = "libksysguard";
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kcompletion kconfigwidgets kcoreaddons kservice
+    kwidgetsaddons qtscript qtwebkit
+  ];
+  propagatedBuildInputs = [
+    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework
+    qtx11extras
+  ];
+}

pkgs/desktops/plasma-5.4/milou.nix

@@ -1,12 +1,5 @@
-{ plasmaPackage
-, extra-cmake-modules
-, qtscript
-, qtdeclarative
-, kcoreaddons
-, ki18n
-, kdeclarative
-, kservice
-, plasma-framework
+{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
+, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
 , krunner
 }:
 
@@ -16,13 +9,9 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    qtscript
-    qtdeclarative
-    kcoreaddons
-    ki18n
-    kdeclarative
-    kservice
-    plasma-framework
-    krunner
+    qtscript kcoreaddons kservice
+  ];
+  propagatedBuildInputs = [
+    kdeclarative ki18n krunner plasma-framework qtdeclarative
   ];
 }

pkgs/desktops/plasma-5.4/oxygen.nix

@@ -1,38 +1,20 @@
-{ plasmaPackage
-, extra-cmake-modules
-, ki18n
-, kcmutils
-, kconfig
-, kdecoration
-, kguiaddons
-, kwidgetsaddons
-, kservice
-, kcompletion
-, frameworkintegration
-, kwindowsystem
-, qtx11extras
+{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig
+, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
+, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
 }:
 
 plasmaPackage {
   name = "oxygen";
   nativeBuildInputs = [
-    extra-cmake-modules
+    extra-cmake-modules makeQtWrapper
   ];
   buildInputs = [
-    ki18n
-    kcmutils
-    kconfig
-    kdecoration
-    kguiaddons
-    kwidgetsaddons
-    kservice
-    kcompletion
-    frameworkintegration
-    kwindowsystem
-    qtx11extras
+    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
+    kservice kcompletion
   ];
+  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/oxygen-demo5"
-    wrapKDEProgram "$out/bin/oxygen-settings5"
+    wrapQtProgram "$out/bin/oxygen-demo5"
+    wrapQtProgram "$out/bin/oxygen-settings5"
   '';
 }

pkgs/desktops/plasma-5.4/plasma-desktop/0001-hwclock.patch

@@ -1,7 +1,7 @@
-From bce620c9dcb25a4e603b22ead5c004b053dae7bf Mon Sep 17 00:00:00 2001
+From 618d86f35b83ee9e57da12be9d0866e34e487b88 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Fri, 28 Aug 2015 10:16:38 -0500
-Subject: [PATCH 1/2] hwclock
+Subject: [PATCH 1/3] hwclock
 
 ---
  kcms/dateandtime/helper.cpp | 6 +-----
@@ -32,5 +32,5 @@ index cec5ab8..fc4a6b9 100644
          KProcess::execute(hwclock, QStringList() << "--systohc");
      }
 -- 
-2.5.0
+2.5.2
 

pkgs/desktops/plasma-5.4/plasma-desktop/0002-zoneinfo.patch

@@ -1,7 +1,7 @@
-From 2778186be31a8f949135ed99232eafee201a668d Mon Sep 17 00:00:00 2001
+From decdc77a7e89b6f1bb3d49268b08a43daf4a7147 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Fri, 28 Aug 2015 10:16:53 -0500
-Subject: [PATCH 2/2] zoneinfo
+Subject: [PATCH 2/3] zoneinfo
 
 ---
  kcms/dateandtime/helper.cpp | 7 ++++++-
@@ -26,5 +26,5 @@ index fc4a6b9..7b64d05 100644
      if (QFile::exists(tz)) { // make sure the new TZ really exists
          QFile::remove("/etc/localtime");
 -- 
-2.5.0
+2.5.2
 

pkgs/desktops/plasma-5.4/plasma-desktop/0003-qt-5.5-QML-import-paths.patch

@@ -0,0 +1,67 @@
+From 4231d70ec08d9bbb367b222d9ef04454c1dc7328 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 19 Oct 2015 18:45:36 -0500
+Subject: [PATCH 3/3] qt-5.5 QML import paths
+
+---
+ applets/pager/package/contents/ui/main.qml              | 2 +-
+ containments/desktop/package/contents/ui/FolderView.qml | 2 +-
+ containments/desktop/package/contents/ui/main.qml       | 2 +-
+ containments/panel/contents/ui/main.qml                 | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml
+index 0c367c6..c9a82be 100644
+--- a/applets/pager/package/contents/ui/main.qml
++++ b/applets/pager/package/contents/ui/main.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
+ import org.kde.draganddrop 2.0
+ import org.kde.plasma.private.pager 2.0
+-import "utils.js" as Utils
++import "../code/utils.js" as Utils
+ 
+ MouseArea {
+     id: root
+diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
+index 578ec87..04e088c 100644
+--- a/containments/desktop/package/contents/ui/FolderView.qml
++++ b/containments/desktop/package/contents/ui/FolderView.qml
+@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.kquickcontrolsaddons 2.0
+ 
+ import org.kde.private.desktopcontainment.folder 0.1 as Folder
+-import "FolderTools.js" as FolderTools
++import "../code/FolderTools.js" as FolderTools
+ 
+ Item {
+     id: main
+diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
+index 8c42706..fc74433 100644
+--- a/containments/desktop/package/contents/ui/main.qml
++++ b/containments/desktop/package/contents/ui/main.qml
+@@ -28,7 +28,7 @@ import org.kde.draganddrop 2.0 as DragDrop
+ 
+ import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
+ 
+-import "LayoutManager.js" as LayoutManager
++import "../code/LayoutManager.js" as LayoutManager
+ 
+ DragDrop.DropArea {
+     id: root
+diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
+index 6a6f364..edba48e 100644
+--- a/containments/panel/contents/ui/main.qml
++++ b/containments/panel/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.kquickcontrolsaddons 2.0
+ import org.kde.draganddrop 2.0 as DragDrop
+ 
+-import "LayoutManager.js" as LayoutManager
++import "../code/LayoutManager.js" as LayoutManager
+ 
+ DragDrop.DropArea {
+     id: root
+-- 
+2.5.2
+

pkgs/desktops/plasma-5.4/plasma-desktop/default.nix

@@ -1,99 +1,45 @@
-{ plasmaPackage
-, substituteAll
-, extra-cmake-modules
-, kdoctools
-, attica
-, baloo
-, boost
-, fontconfig
-, kactivities
-, kauth
-, kcmutils
-, kdbusaddons
-, kdeclarative
-, kded
-, kdelibs4support
-, kemoticons
-, kglobalaccel
-, ki18n
-, kitemmodels
-, knewstuff
-, knotifications
-, knotifyconfig
-, kpeople
-, krunner
-, kwallet
-, kwin
-, phonon
-, plasma-framework
-, plasma-workspace
-, qtdeclarative
-, qtx11extras
-, qtsvg
-, libXcursor
-, libXft
-, libxkbfile
-, xf86inputevdev
-, xf86inputsynaptics
-, xinput
-, xkeyboard_config
-, xorgserver
-, libcanberra_kde
-, libpulseaudio
-, utillinux
+{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils
+, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
+, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
+, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon
+, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
+, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
+, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
+, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
+, qtquick1, qtquickcontrols
 }:
 
-plasmaPackage {
+plasmaPackage rec {
   name = "plasma-desktop";
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    attica
-    baloo
-    boost
-    fontconfig
-    kactivities
-    kauth
-    kcmutils
-    kdbusaddons
-    kdeclarative
-    kded
-    kdelibs4support
-    kemoticons
-    kglobalaccel
-    ki18n
-    kitemmodels
-    knewstuff
-    knotifications
-    knotifyconfig
-    kpeople
-    krunner
-    kwallet
-    kwin
-    libcanberra_kde
-    libXcursor
-    libpulseaudio
-    libXft
-    libxkbfile
-    phonon
-    plasma-framework
-    plasma-workspace
-    qtdeclarative
-    qtx11extras
-    qtsvg
-    xf86inputevdev
-    xf86inputsynaptics
-    xkeyboard_config
-    xinput
+    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
+  ];
+  # All propagatedBuildInputs should be present in the profile because
+  # wrappers cannot be used here.
+  propagatedUserEnvPkgs = propagatedBuildInputs;
   patches = [
     (substituteAll {
       src = ./0001-hwclock.patch;
       hwclock = "${utillinux}/sbin/hwclock";
     })
     ./0002-zoneinfo.patch
+    ./0003-qt-5.5-QML-import-paths.patch
   ];
   NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
   cmakeFlags = [
@@ -101,13 +47,13 @@ plasmaPackage {
     "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
   ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/kaccess"
-    wrapKDEProgram "$out/bin/solid-action-desktop-gen"
-    wrapKDEProgram "$out/bin/knetattach"
-    wrapKDEProgram "$out/bin/krdb"
-    wrapKDEProgram "$out/bin/kapplymousetheme"
-    wrapKDEProgram "$out/bin/kfontinst"
-    wrapKDEProgram "$out/bin/kcm-touchpad-list-devices"
-    wrapKDEProgram "$out/bin/kfontview"
+    wrapQtProgram "$out/bin/kaccess"
+    wrapQtProgram "$out/bin/solid-action-desktop-gen"
+    wrapQtProgram "$out/bin/knetattach"
+    wrapQtProgram "$out/bin/krdb"
+    wrapQtProgram "$out/bin/kapplymousetheme"
+    wrapQtProgram "$out/bin/kfontinst"
+    wrapQtProgram "$out/bin/kcm-touchpad-list-devices"
+    wrapQtProgram "$out/bin/kfontview"
   '';
 }

pkgs/desktops/plasma-5.4/plasma-mediacenter.nix

@@ -1,40 +1,23 @@
-{ plasmaPackage
-, extra-cmake-modules
-, baloo
-, kactivities
-, kconfig
-, kcoreaddons
-, kdeclarative
-, kguiaddons
-, ki18n
-, kio
-, kservice
-, kfilemetadata
-, plasma-framework
-, qtdeclarative
-, qtmultimedia
+{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig
+, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice
+, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia
 , taglib
 }:
 
-plasmaPackage {
+plasmaPackage rec {
   name = "plasma-mediacenter";
   nativeBuildInputs = [
     extra-cmake-modules
   ];
   buildInputs = [
-    baloo
-    kactivities
-    kconfig
-    kcoreaddons
-    kdeclarative
-    kguiaddons
-    ki18n
-    kio
-    kservice
-    kfilemetadata
-    plasma-framework
-    qtdeclarative
-    qtmultimedia
-    taglib
+    kconfig kcoreaddons kguiaddons kservice
+    qtdeclarative qtmultimedia taglib
   ];
+  propagatedBuildInputs = [
+    baloo kactivities kdeclarative kfilemetadata ki18n kio
+    plasma-framework
+  ];
+  # All propagatedBuildInputs should be present in the profile because
+  # wrappers cannot be used here.
+  propagatedUserEnvPkgs = propagatedBuildInputs;
 }

pkgs/desktops/plasma-5.4/plasma-nm.nix

@@ -1,65 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kcompletion
-, kconfigwidgets
-, kcoreaddons
-, kdbusaddons
-, kdeclarative
-, kdelibs4support
-, ki18n
-, kiconthemes
-, kinit
-, kio
-, kitemviews
-, knotifications
-, kservice
-, kwallet
-, kwidgetsaddons
-, kwindowsystem
-, kxmlgui
-, mobile_broadband_provider_info
-, modemmanager-qt
-, networkmanager-qt
-, openconnect
-, plasma-framework
-, qtdeclarative
-, solid
-}:
-
-plasmaPackage {
-  name = "plasma-nm";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcompletion
-    kconfigwidgets
-    kcoreaddons
-    kdbusaddons
-    kdeclarative
-    kdelibs4support
-    ki18n
-    kiconthemes
-    kinit
-    kio
-    kitemviews
-    knotifications
-    kservice
-    kwallet
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    mobile_broadband_provider_info
-    modemmanager-qt
-    networkmanager-qt
-    openconnect
-    plasma-framework
-    qtdeclarative
-    solid
-  ];
-  postInstall = ''
-    wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
-  '';
-}

pkgs/desktops/plasma-5.4/plasma-nm/0001-mobile-broadband-provider-info-path.patch

@@ -0,0 +1,25 @@
+From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 25 Oct 2015 09:09:27 -0500
+Subject: [PATCH] mobile-broadband-provider-info path
+
+---
+ libs/editor/mobileproviders.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp
+index 568cb34..98a5992 100644
+--- a/libs/editor/mobileproviders.cpp
++++ b/libs/editor/mobileproviders.cpp
+@@ -26,7 +26,7 @@
+ 
+ #include <KLocale>
+ 
+-const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml";
++const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml";
+ 
+ bool localeAwareCompare(const QString & one, const QString & two) {
+     return one.localeAwareCompare(two) < 0;
+-- 
+2.6.2
+

pkgs/desktops/plasma-5.4/plasma-nm/default.nix

@@ -0,0 +1,36 @@
+{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
+, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
+, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
+, kxmlgui, makeQtWrapper, mobile_broadband_provider_info
+, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
+, qtdeclarative, solid
+}:
+
+plasmaPackage {
+  name = "plasma-nm";
+  patches = [
+    (substituteAll {
+      src = ./0001-mobile-broadband-provider-info-path.patch;
+      inherit mobile_broadband_provider_info;
+    })
+  ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kinit kitemviews knotifications kservice kwallet kwidgetsaddons
+    kxmlgui mobile_broadband_provider_info modemmanager-qt
+    networkmanager-qt openconnect solid
+  ];
+  propagatedBuildInputs = [
+    kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
+    qtdeclarative
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kde5-nm-connection-editor"
+  '';
+}

pkgs/desktops/plasma-5.4/plasma-pa.nix

@@ -1,12 +1,5 @@
-{ plasmaPackage
-, extra-cmake-modules
-, glib
-, kconfigwidgets
-, kcoreaddons
-, kdeclarative
-, kglobalaccel
-, ki18n
-, libpulseaudio
+{ plasmaPackage, extra-cmake-modules, glib, kconfigwidgets
+, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
 , plasma-framework
 }:
 
@@ -16,13 +9,9 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    glib
-    kconfigwidgets
-    kcoreaddons
-    kdeclarative
-    kglobalaccel
-    ki18n
-    libpulseaudio
-    plasma-framework
+    glib kconfigwidgets kcoreaddons libpulseaudio
+  ];
+  propagatedBuildInputs = [
+    kdeclarative kglobalaccel ki18n plasma-framework
   ];
 }

pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch

@@ -1,14 +1,14 @@
-From d34575dc1edb9fcc8e7608e82e63c6c9d20f37ea Mon Sep 17 00:00:00 2001
+From 35efc2ce92ed698abb21a79aa6e6670e844ea776 Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
 Date: Thu, 27 Aug 2015 20:36:39 -0500
-Subject: [PATCH] startkde NixOS patches
+Subject: [PATCH 1/2] startkde NixOS patches
 
 ---
- startkde/startkde.cmake | 219 ++++++++++++++++++++----------------------------
- 1 file changed, 89 insertions(+), 130 deletions(-)
+ startkde/startkde.cmake | 217 ++++++++++++++++++++----------------------------
+ 1 file changed, 88 insertions(+), 129 deletions(-)
 
 diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index cfbe227..999dd8f 100644
+index 2c4c315..7733721 100644
 --- a/startkde/startkde.cmake
 +++ b/startkde/startkde.cmake
 @@ -1,8 +1,31 @@
@@ -94,7 +94,7 @@ index cfbe227..999dd8f 100644
  
  #This is basically setting defaults so we can use them with kstartupconfig5
  cat >$configDir/startupconfigkeys <<EOF
-@@ -101,55 +106,21 @@ XftSubPixel=none
+@@ -101,53 +106,19 @@ XftSubPixel=none
  EOF
  }
  
@@ -150,11 +150,8 @@ index cfbe227..999dd8f 100644
  if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
 -    @EXPORT_XCURSOR_PATH@
  
--    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-+    @out@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
      if test $? -eq 10; then
-         XCURSOR_THEME=breeze_cursors
-         export XCURSOR_THEME
 @@ -163,21 +134,39 @@ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize"
      fi
  fi
@@ -400,5 +397,5 @@ index cfbe227..999dd8f 100644
  
  echo 'startkde: Done.'  1>&2
 -- 
-2.5.0
+2.6.2
 

pkgs/desktops/plasma-5.4/plasma-workspace/0002-qt-5.5-QML-import-paths.patch

@@ -0,0 +1,123 @@
+From 033d3560d26ceabbd6da6310d326fec7a473df82 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 19 Oct 2015 18:55:36 -0500
+Subject: [PATCH 2/2] qt-5.5 QML import paths
+
+---
+ applets/analog-clock/contents/ui/analogclock.qml                     | 2 +-
+ applets/batterymonitor/package/contents/ui/BatteryItem.qml           | 2 +-
+ applets/batterymonitor/package/contents/ui/CompactRepresentation.qml | 2 +-
+ applets/batterymonitor/package/contents/ui/PopupDialog.qml           | 2 +-
+ applets/batterymonitor/package/contents/ui/batterymonitor.qml        | 2 +-
+ applets/lock_logout/contents/ui/lockout.qml                          | 2 +-
+ applets/notifications/package/contents/ui/main.qml                   | 2 +-
+ applets/systemtray/package/contents/ui/main.qml                      | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/applets/analog-clock/contents/ui/analogclock.qml b/applets/analog-clock/contents/ui/analogclock.qml
+index edb3af9..7eb839d 100644
+--- a/applets/analog-clock/contents/ui/analogclock.qml
++++ b/applets/analog-clock/contents/ui/analogclock.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as PlasmaCalendar
+ import QtQuick.Layouts 1.1
+ 
+ import org.kde.plasma.core 2.0 as PlasmaCore
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: analogclock
+diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+index 8d43797..3322369 100644
+--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml
++++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
+ 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
+diff --git a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml b/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+index b4059cb..ae8eeaf 100755
+--- a/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
++++ b/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
+diff --git a/applets/batterymonitor/package/contents/ui/PopupDialog.qml b/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+index d4952c6..2b6586d 100644
+--- a/applets/batterymonitor/package/contents/ui/PopupDialog.qml
++++ b/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
+ 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
+diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+index a086581..6e1e8be 100755
+--- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml
++++ b/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
+diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
+index d243796..86475df 100644
+--- a/applets/lock_logout/contents/ui/lockout.qml
++++ b/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
+diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
+index 2871cdb..3f50856 100644
+--- a/applets/notifications/package/contents/ui/main.qml
++++ b/applets/notifications/package/contents/ui/main.qml
+@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ 
+ import org.kde.plasma.private.notifications 1.0
+ 
+-import "uiproperties.js" as UiProperties
++import "../code/uiproperties.js" as UiProperties
+ 
+ MouseEventListener {
+     id: notificationsApplet
+diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml
+index 2e26455..864c9c5 100644
+--- a/applets/systemtray/package/contents/ui/main.qml
++++ b/applets/systemtray/package/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
+ // 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
+-- 
+2.6.2
+

pkgs/desktops/plasma-5.4/plasma-workspace/default.nix

@@ -1,103 +1,37 @@
-{ plasmaPackage
-, 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
-, qtscript
-, qtx11extras
-, wayland
-, libksysguard
-, bash
-, coreutils
-, gnused
-, gnugrep
-, socat
-, kconfig
-, kinit
-, kservice
-, qttools
-, dbus_tools
-, mkfontdir
-, xmessage
-, xprop
-, xrdb
-, xset
-, xsetroot
+{ plasmaPackage, 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, bash, coreutils, gnused, gnugrep, socat, kconfig
+, kinit, kservice, makeQtWrapper, qttools, dbus_tools, mkfontdir, xmessage
+, xprop, xrdb, xset, xsetroot, solid, qtquickcontrols
 }:
 
-plasmaPackage {
+plasmaPackage rec {
   name = "plasma-workspace";
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    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
-    qtscript
-    qtx11extras
-    wayland
+    kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff
+    knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient
+    libdbusmenu libSM libXcursor networkmanager-qt pam phonon
+    qtscript wayland
   ];
   propagatedBuildInputs = [
-    libksysguard
+    baloo kactivities kdeclarative kdelibs4support kglobalaccel
+    kidletime krunner ktexteditor kwin libkscreen libksysguard
+    plasma-framework qtquick1 qtquickcontrols qtx11extras solid
+  ];
+  patches = [
+    ./0001-startkde-NixOS-patches.patch
+    ./0002-qt-5.5-QML-import-paths.patch
   ];
-  patches = [ ./0001-startkde-NixOS-patches.patch ];
 
   inherit bash coreutils gnused gnugrep socat;
   inherit kconfig kinit kservice qttools;
@@ -108,18 +42,22 @@ plasmaPackage {
       --replace kdostartupconfig5 $out/bin/kdostartupconfig5
   '';
   postInstall = ''
-    wrapKDEProgram "$out/bin/ksmserver"
-    wrapKDEProgram "$out/bin/plasmawindowed"
-    wrapKDEProgram "$out/bin/kcminit_startup"
-    wrapKDEProgram "$out/bin/ksplashqml"
-    wrapKDEProgram "$out/bin/kcheckrunning"
-    wrapKDEProgram "$out/bin/systemmonitor"
-    wrapKDEProgram "$out/bin/kstartupconfig5"
-    wrapKDEProgram "$out/bin/startplasmacompositor"
-    wrapKDEProgram "$out/bin/kdostartupconfig5"
-    wrapKDEProgram "$out/bin/klipper"
-    wrapKDEProgram "$out/bin/kuiserver5"
-    wrapKDEProgram "$out/bin/krunner"
-    wrapKDEProgram "$out/bin/plasmashell"
+    wrapQtProgram "$out/bin/ksmserver"
+    wrapQtProgram "$out/bin/plasmawindowed"
+    wrapQtProgram "$out/bin/kcminit_startup"
+    wrapQtProgram "$out/bin/ksplashqml"
+    wrapQtProgram "$out/bin/kcheckrunning"
+    wrapQtProgram "$out/bin/systemmonitor"
+    wrapQtProgram "$out/bin/kstartupconfig5"
+    wrapQtProgram "$out/bin/startplasmacompositor"
+    wrapQtProgram "$out/bin/kdostartupconfig5"
+    wrapQtProgram "$out/bin/klipper"
+    wrapQtProgram "$out/bin/kuiserver5"
+    wrapQtProgram "$out/bin/krunner"
+    wrapQtProgram "$out/bin/plasmashell"
+
+    wrapQtProgram "$out/lib/libexec/drkonqi"
+    wrapQtProgram "$out/lib/libexec/kscreenlocker_greet"
+    rm "$out/lib/libexec/startplasma"
   '';
 }

pkgs/desktops/plasma-5.4/polkit-kde-agent.nix

@@ -18,8 +18,6 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    ki18n
-    kwindowsystem
     kdbusaddons
     kwidgetsaddons
     kcoreaddons
@@ -29,4 +27,5 @@ plasmaPackage {
     knotifications
     polkitQt
   ];
+  propagatedBuildInputs = [ ki18n kwindowsystem ];
 }

pkgs/desktops/plasma-5.4/powerdevil.nix

@@ -1,21 +1,7 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kactivities
-, kauth
-, kconfig
-, kdbusaddons
-, kdelibs4support
-, kglobalaccel
-, ki18n
-, kidletime
-, kio
-, knotifyconfig
-, libkscreen
-, plasma-workspace
-, qtx11extras
-, solid
-, udev
+{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
+, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
+, kidletime, kio, knotifyconfig, libkscreen, plasma-workspace
+, qtx11extras, solid, udev
 }:
 
 plasmaPackage {
@@ -25,20 +11,10 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kactivities
-    kauth
-    kconfig
-    kdbusaddons
-    kdelibs4support
-    kglobalaccel
-    ki18n
-    kidletime
-    kio
-    knotifyconfig
-    libkscreen
-    plasma-workspace
-    qtx11extras
-    solid
-    udev
+    kconfig kdbusaddons knotifyconfig solid udev
+  ];
+  propagatedBuildInputs = [
+    kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime
+    libkscreen plasma-workspace qtx11extras
   ];
 }

pkgs/desktops/plasma-5.4/systemsettings.nix

@@ -1,17 +1,6 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kitemviews
-, kcmutils
-, ki18n
-, kio
-, kservice
-, kiconthemes
-, kwindowsystem
-, kxmlgui
-, kdbusaddons
-, kconfig
-, khtml
+{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews
+, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem
+, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper
 }:
 
 plasmaPackage {
@@ -19,21 +8,14 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    kitemviews
-    kcmutils
-    ki18n
-    kio
-    kservice
-    kiconthemes
-    kwindowsystem
-    kxmlgui
-    kdbusaddons
+    kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
     kconfig
-    khtml
   ];
+  propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
   postInstall = ''
-    wrapKDEProgram "$out/bin/systemsettings5"
+    wrapQtProgram "$out/bin/systemsettings5"
   '';
 }

pkgs/development/haskell-modules/configuration-common.nix

@@ -64,7 +64,7 @@ self: super: {
   # all required dependencies are part of Stackage. To comply with Stackage, we
   # make 'git-annex-without-assistant' our default version, but offer another
   # build which has the assistant to be used in the top-level.
-  git-annex_5_20151019 = (disableCabalFlag super.git-annex_5_20151019 "assistant").override {
+  git-annex_5_20150727 = (disableCabalFlag super.git-annex_5_20150727 "assistant").override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
     fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;