diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-13 19:29:13 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-13 19:29:13 +0000 |
| commit | 83814bdc418cad61db338c8ed96feff5bb6894c2 (patch) | |
| tree | 3c69b8aff30d55d2073ffe3dda4a53f95b8deef2 /pkgs/os-specific/linux/wpa_supplicant | |
| parent | 8c6b8753d5a4207957b11f428da1c1b5c2330ef6 (diff) | |
| download | nixpkgs-83814bdc418cad61db338c8ed96feff5bb6894c2.tar nixpkgs-83814bdc418cad61db338c8ed96feff5bb6894c2.tar.gz nixpkgs-83814bdc418cad61db338c8ed96feff5bb6894c2.tar.bz2 nixpkgs-83814bdc418cad61db338c8ed96feff5bb6894c2.tar.lz nixpkgs-83814bdc418cad61db338c8ed96feff5bb6894c2.tar.xz nixpkgs-83814bdc418cad61db338c8ed96feff5bb6894c2.tar.zst nixpkgs-83814bdc418cad61db338c8ed96feff5bb6894c2.zip | |
Changes required by NM-0.9
* Add NL80211 driver * Install d-bus config files svn path=/nixpkgs/trunk/; revision=29248
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 9 |
1 files 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 = { |