From 83814bdc418cad61db338c8ed96feff5bb6894c2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 13 Sep 2011 19:29:13 +0000
Subject: [PATCH] Changes required by NM-0.9

* Add NL80211 driver
* Install d-bus config files

svn path=/nixpkgs/trunk/; revision=29248
---
 pkgs/os-specific/linux/wpa_supplicant/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 64efc1aee39..fcb6641dfd9 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig}:
+{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig, libnl1}:
 
 let
   version = "0.7.3";
@@ -19,10 +19,11 @@ in
     echo CONFIG_CTRL_IFACE_DBUS=y | tee -a .config
     echo CONFIG_CTRL_IFACE_DBUS_NEW=y | tee -a .config
     echo CONFIG_CTRL_IFACE_DBUS_INTRO=y | tee -a .config
+    echo CONFIG_DRIVER_NL80211=y | tee -a .config
     substituteInPlace Makefile --replace /usr/local $out
   '';
 
-  buildInputs = [openssl dbus_libs];
+  buildInputs = [openssl dbus_libs libnl1];
 
   buildNativeInputs = [ pkgconfig ];
 
@@ -37,6 +38,10 @@ in
     ensureDir $out/share/man/man5 $out/share/man/man8
     cp -v doc/docbook/*.5 $out/share/man/man5/
     cp -v doc/docbook/*.8 $out/share/man/man8/
+    ensureDir $out/etc/dbus-1/system.d $out/share/dbus-1/system-services
+    cp -v dbus/*service $out/share/dbus-1/system-services
+    sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/*
+    cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d
   '';
 
   meta = {