Changes required by NM-0.9

* Add NL80211 driver
* Install d-bus config files

svn path=/nixpkgs/trunk/; revision=29248
This commit is contained in:
Yury G. Kudryashov 2011-09-13 19:29:13 +00:00
parent 8c6b8753d5
commit 83814bdc41

View File

@ -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 = {