Merge master into closure-size

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

pkgs/desktops/xfce/default.nix

@@ -14,7 +14,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
 
   #### NixOS support
 
-  inherit (pkgs) gvfs;
+  gvfs = pkgs.gvfs.override { samba = null; }; # samba is a rather heavy dependency
   xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc";
 
   #### CORE                 from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"

pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix

@@ -5,8 +5,8 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   p_name  = "xfce4-whiskermenu-plugin";
   ver_maj = "1.5";
-  ver_min = "1";
-  rev = "18c31a357c102ab38e98ac24c154f9e6187b3ef8";
+  ver_min = "2";
+  rev = "d08418c8d55edfacef190ec14e03e1e9a6988101";
 
   name = "${p_name}-${ver_maj}.${ver_min}";
 
@@ -14,15 +14,20 @@ stdenv.mkDerivation rec {
     owner = "gottcode";
     repo = "xfce4-whiskermenu-plugin";
     inherit rev;
-    sha256 = "442e887877ffc347378c23ded2466ebbfc7aacb6b91fc395b12071320616eb76";
+    sha256 = "0icphm6bm5p3csh9kwyyvkj2y87shrs12clfifbhv35dm0skb2dx";
   };
 
   buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel
                   gtk exo garcon ];
 
+  preFixup = ''
+    substituteInPlace $out/bin/xfce4-popup-whiskermenu \
+      --replace $out/bin/xfce4-panel ${xfce4panel}/bin/xfce4-panel
+  '';
+
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
-    description = "Whisker Menu is an alternate application launcher for Xfce.";
+    description = "Whisker Menu is an alternate application launcher for Xfce";
     platforms = platforms.linux;
     maintainers = [ maintainers.pjbarnoy ];
   };