1 files changed, 22 insertions, 21 deletions
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index f2acf03958b6..96f742df3105 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -1,45 +1,46 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib
-, desktopSupport
-, gtk2, gnome2_panel, GConf2
+, desktopSupport, xlibs
+, gtk2
+, gtk3, gnome3, mate
 , libxfce4util, xfce4-panel
 }:
 
-assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4";
+assert desktopSupport == "gnomeflashback" || desktopSupport == "mate"  || desktopSupport == "xfce4";
 
 stdenv.mkDerivation rec {
-  version = "2.1.0";
+  version = "unstable-2017-09-15";
   pname = "xmonad-log-applet";
-  name = "${pname}-${version}-${desktopSupport}";
+  name = "${pname}-${desktopSupport}-${version}";
 
   src = fetchFromGitHub {
-    owner = "alexkay";
+    owner = "kalj";
     repo = pname;
-    rev = "${version}";
-    sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p";
+    rev = "a1b294cad2f266e4f18d9de34167fa96a0ffdba8";
+    sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw";
   };
 
-  buildInputs =  with stdenv.lib;
-                 [ glib dbus-glib ]
-              ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ]
-              # TODO: no idea where to find libpanelapplet-4.0
-              ++ optionals (desktopSupport == "gnome3") [ ]
-              ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
-              ;
-  
+  buildInputs = [ glib dbus-glib xlibs.xcbutilwm ]
+    ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ]
+    ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
+    ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
+  ;
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  
+
   configureFlags =  [ "--with-panel=${desktopSupport}" ];
-  
+
   patches = [ ./fix-paths.patch ];
 
+  # Setup hook replaces ${prefix} in pc files so we cannot use
+  # --define-variable=prefix=$prefix
+  PKG_CONFIG_LIBXFCE4PANEL_1_0_LIBDIR = "$(out)/lib";
+
   meta = with stdenv.lib; {
-    homepage = https://github.com/alexkay/xmonad-log-applet;
+    homepage = https://github.com/kalj/xmonad-log-applet;
     license = licenses.bsd3;
     description = "An applet that will display XMonad log information (${desktopSupport} version)";
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];
-
-    broken = desktopSupport == "gnome3";
   };
 }