Author: urkud
Date: Tue Sep 13 19:29:13 2011
New Revision: 29248
URL: https://ssl.nixos.org/websvn/nix/?rev=29248&sc=1
Log:
Changes required by NM-0.9
* Add NL80211 driver
* Install d-bus config files
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix Tue Sep
13 19:27:41 2011 (r29247)
+++ nixpkgs/trunk/pkgs/os-specific/linux/wpa_supplicant/default.nix Tue Sep
13 19:29:13 2011 (r29248)
@@ -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 @@
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 @@
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 = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
