Merge remote-tracking branch 'origin/master' into stdenv-updates

2013-01-22 23:23:53 +01:00
parent 3e2e62ca31 296cd66009
commit 0a47a28f1d
73 changed files with 2686 additions and 1817 deletions
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
 , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
-, useSystemd ? false, systemd ? null
+, useSystemd ? true, systemd
 }:

 assert stdenv.isLinux;