Merge remote-tracking branch 'origin/master' into staging

2016-09-05 19:10:12 +02:00
parent 741527adef 2919375c91
commit 7c239702b5
140 changed files with 2400 additions and 608 deletions
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, expat, systemd, glib, dbus_glib, python
+{ stdenv, lib, fetchurl, pkgconfig, expat, systemd
 , libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:

 assert x11Support -> libX11 != null