diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-11 07:27:01 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-09-11 07:27:01 +0000 |
| commit | 68a3b1395e4153b33cc1c0faca30aa4cef56833f (patch) | |
| tree | e8f73d554d8afcac8fec9839db55cc40794d3b64 /pkgs/os-specific/linux/wpa_supplicant | |
| parent | 134fb92f73b4397da9007a93036524f871a09798 (diff) | |
| download | nixpkgs-68a3b1395e4153b33cc1c0faca30aa4cef56833f.tar nixpkgs-68a3b1395e4153b33cc1c0faca30aa4cef56833f.tar.gz nixpkgs-68a3b1395e4153b33cc1c0faca30aa4cef56833f.tar.bz2 nixpkgs-68a3b1395e4153b33cc1c0faca30aa4cef56833f.tar.lz nixpkgs-68a3b1395e4153b33cc1c0faca30aa4cef56833f.tar.xz nixpkgs-68a3b1395e4153b33cc1c0faca30aa4cef56833f.tar.zst nixpkgs-68a3b1395e4153b33cc1c0faca30aa4cef56833f.zip | |
wpa_supplicant-0.7.3
Add D-Bus interface required by NM-0.9 svn path=/nixpkgs/trunk/; revision=29163
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 875a4811f92..64efc1aee39 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, openssl, qt4, inkscape}: +{stdenv, fetchurl, openssl, qt4, inkscape, dbus_libs, pkgconfig}: let - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { url = "http://hostap.epitest.fi/releases/wpa_supplicant-${version}.tar.gz"; - sha256 = "1gnwhnczli50gidsq22ya68hixmdrhd1sxw202ygihvg6xsjl06z"; + sha256 = "0hwlsn512q2ps8wxxjmkjfdg3vjqqb9mxnnwfv1wqijkm3551kfh"; }; in @@ -16,10 +16,22 @@ in cd wpa_supplicant cp -v defconfig .config echo CONFIG_DEBUG_SYSLOG=y | tee -a .config + 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 substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [openssl]; + buildInputs = [openssl dbus_libs]; + + buildNativeInputs = [ pkgconfig ]; + + # Upstream patch required for NetworkManager-0.9 + patches = [ (fetchurl { + url = "http://w1.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commitdiff_plain;h=b80b5639935d37b95d00f86b57f2844a9c775f57"; + name = "wpa_supplicant-nm-0.9.patch"; + sha256 = "1pqba0l4rfhba5qafvvbywi9x1qmphs944p704bh1flnx7cz6ya8"; + }) ]; postInstall = '' ensureDir $out/share/man/man5 $out/share/man/man8 |