Merge branch 'master' into staging

2015-05-29 14:52:51 -07:00
parent c4f1011cab be5f4082fd
commit e5bf20a6c6
443 changed files with 8079 additions and 1223 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pulseaudio
+{ stdenv, fetchurl, pkgconfig, libpulseaudio
 , gtk2, libnotify
 , keybinder, xfconf
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs =
-    [ pulseaudio gtk2
+    [ libpulseaudio gtk2
      keybinder xfconf libnotify
    ];