Merge branch 'master.upstream' into staging.upstream

2015-11-07 15:51:51 -08:00
parent fa5ad20922 9fd510e95a
commit a26c8e9b83
53 changed files with 1024 additions and 146 deletions
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [ wirelesstools udev libgudev libnl libuuid polkit ppp libndp
-                  xz bluez5 gobjectIntrospection modemmanager readline newt libsoup ];
+                  xz bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ];

  propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];