Merge commit 'cb21b77' into master.upstream

This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
parent 83aeb00a78 cb21b77ff1
commit 9579c9ec7f
392 changed files with 7282 additions and 7266 deletions
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
-, xfconf, udev, libnotify }:
+, xfconf, udev, libgudev, libnotify }:

 stdenv.mkDerivation rec {
  p_name  = "thunar-volman";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {


  buildInputs =
-    [ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util
+    [ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util
      xfconf libnotify
    ];
  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";