Merge remote-tracking branch 'origin/master' into systemd-219

2 files changed, 47 insertions, 18 deletions

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 5fdab2ab81e6..2f563dbbf5ca 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -68,24 +68,24 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   #### PANEL PLUGINS        from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}"
 
 
-  xfce4_battery_plugin    = callPackage ./panel-plugins/xfce4-battery-plugin.nix    { };
-  xfce4_clipman_plugin    = callPackage ./panel-plugins/xfce4-clipman-plugin.nix    { };
-  xfce4_cpufreq_plugin    = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix    { };
-  xfce4_cpugraph_plugin   = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix   { };
-  xfce4_datetime_plugin   = callPackage ./panel-plugins/xfce4-datetime-plugin.nix   { };
-  xfce4_dict_plugin       = callPackage ./panel-plugins/xfce4-dict-plugin.nix       { };
-  xfce4_embed_plugin      = callPackage ./panel-plugins/xfce4-embed-plugin.nix      { };
-  xfce4_eyes_plugin       = callPackage ./panel-plugins/xfce4-eyes-plugin.nix       { };
-  xfce4_fsguard_plugin    = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix    { };
-  xfce4_genmon_plugin     = callPackage ./panel-plugins/xfce4-genmon-plugin.nix     { };
-
-  xfce4_netload_plugin    = callPackage ./panel-plugins/xfce4-netload-plugin.nix    { };
-  xfce4_notes_plugin      = callPackage ./panel-plugins/xfce4-notes-plugin.nix      { };
-  xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { };
-  xfce4_verve_plugin      = callPackage ./panel-plugins/xfce4-verve-plugin.nix      { };
-  xfce4_xkb_plugin        = callPackage ./panel-plugins/xfce4-xkb-plugin.nix        { };
-
-
+  xfce4_battery_plugin     = callPackage ./panel-plugins/xfce4-battery-plugin.nix     { };
+  xfce4_clipman_plugin     = callPackage ./panel-plugins/xfce4-clipman-plugin.nix     { };
+  xfce4_cpufreq_plugin     = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix     { };
+  xfce4_cpugraph_plugin    = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix    { };
+  xfce4_datetime_plugin    = callPackage ./panel-plugins/xfce4-datetime-plugin.nix    { };
+  xfce4_dict_plugin        = callPackage ./panel-plugins/xfce4-dict-plugin.nix        { };
+  xfce4_embed_plugin       = callPackage ./panel-plugins/xfce4-embed-plugin.nix       { };
+  xfce4_eyes_plugin        = callPackage ./panel-plugins/xfce4-eyes-plugin.nix        { };
+  xfce4_fsguard_plugin     = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix     { };
+  xfce4_genmon_plugin      = callPackage ./panel-plugins/xfce4-genmon-plugin.nix      { };
+
+  xfce4_netload_plugin     = callPackage ./panel-plugins/xfce4-netload-plugin.nix     { };
+  xfce4_notes_plugin       = callPackage ./panel-plugins/xfce4-notes-plugin.nix       { };
+  xfce4_systemload_plugin  = callPackage ./panel-plugins/xfce4-systemload-plugin.nix  { };
+  xfce4_verve_plugin       = callPackage ./panel-plugins/xfce4-verve-plugin.nix       { };
+  xfce4_xkb_plugin         = callPackage ./panel-plugins/xfce4-xkb-plugin.nix         { };
+
+  xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
 
 
 }; # xfce_self
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
new file mode 100644
index 000000000000..420eb128a420
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, intltool, libxfce4util, libxfcegui4
+, xfce4panel, gtk, exo, garcon }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-whiskermenu-plugin";
+  ver_maj = "1.5";
+  ver_min = "1";
+  rev = "18c31a357c102ab38e98ac24c154f9e6187b3ef8";
+
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  src = fetchFromGitHub {
+    owner = "gottcode";
+    repo = "xfce4-whiskermenu-plugin";
+    inherit rev;
+    sha256 = "442e887877ffc347378c23ded2466ebbfc7aacb6b91fc395b12071320616eb76";
+  };
+
+  buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel
+                  gtk exo garcon ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Whisker Menu is an alternate application launcher for Xfce.";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.pjbarnoy ];
+  };
+}