From a87a1bca04c76fcb92b8bd13697b3c036a239534 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Dec 2011 23:16:32 +0000
Subject: [PATCH] wpa_supplicant: add D-Bus interface

svn path=/nixos/trunk/; revision=30972
---
 modules/services/networking/wpa_supplicant.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/services/networking/wpa_supplicant.nix b/modules/services/networking/wpa_supplicant.nix
index 547280931c99..7e29747dcc2b 100644
--- a/modules/services/networking/wpa_supplicant.nix
+++ b/modules/services/networking/wpa_supplicant.nix
@@ -44,6 +44,8 @@ in
 
     environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
+    services.dbus.packages = [ pkgs.wpa_supplicant ];
+
     jobs.wpa_supplicant = 
       { startOn = "started network-interfaces";
         stopOn = "stopping network-interfaces";
@@ -57,8 +59,8 @@ in
           '';
 
         exec =
-          "wpa_supplicant -s -C /var/run/wpa_supplicant " +
-          "-c ${configFile} -i${config.networking.WLANInterface}";
+          "wpa_supplicant -s -u -c ${configFile} "
+          + (optionalString (config.networking.WLANInterface != null) "-i ${config.networking.WLANInterface}");
       };
   
   };