public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #290 from vcunat/vlada/wpa-notg

Browse Source 
wpa_supplicant: refactor settings, readline support (on by default)
This commit is contained in:
Peter Simons 2013-01-30 02:27:46 -08:00
commit e4d79d21aa
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/os-specific/linux/wpa_supplicant/default.nix
View File

@ -1,4 +1,7 @@
{ stdenv, fetchurl, openssl, dbus_libs, pkgconfig, libnl }: { stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl
, readlineSupport ? true, readline
}:
assert readlineSupport -> readline!=null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1"; version = "1.1";
@ -9,20 +12,26 @@ stdenv.mkDerivation rec {
url = "http://hostap.epitest.fi/releases/${name}.tar.gz"; url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5";
}; };
extraConfig = lib.concatStringsSep "\n" (
[ "CONFIG_DEBUG_SYSLOG=y"
"CONFIG_CTRL_IFACE_DBUS=y"
"CONFIG_CTRL_IFACE_DBUS_NEW=y"
"CONFIG_CTRL_IFACE_DBUS_INTRO=y"
"CONFIG_DRIVER_NL80211=y"
"CONFIG_LIBNL32=y"
] ++ lib.optional readlineSupport "CONFIG_READLINE=y"
);
preBuild = '' preBuild = ''
cd wpa_supplicant cd wpa_supplicant
cp -v defconfig .config cp -v defconfig .config
echo CONFIG_DEBUG_SYSLOG=y | tee -a .config echo ${extraConfig} | 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
echo CONFIG_DRIVER_NL80211=y | tee -a .config
echo CONFIG_LIBNL32=y | tee -a .config echo CONFIG_LIBNL32=y | tee -a .config
substituteInPlace Makefile --replace /usr/local $out substituteInPlace Makefile --replace /usr/local $out
''; '';
buildInputs = [ openssl dbus_libs libnl ]; buildInputs = [ openssl dbus_libs libnl ]
++ lib.optional readlineSupport readline;
buildNativeInputs = [ pkgconfig ]; buildNativeInputs = [ pkgconfig ];