From 0072c442557b4d57fe128bf75775b2912f94b313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Jan 2013 17:37:06 +0100
Subject: [PATCH] wpa_supplicant: refactor settings, readline support (on by
 default)

---
 .../linux/wpa_supplicant/default.nix          | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index b1bc15ff0836..c74fc8d634fe 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -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 {
   version = "1.1";
@@ -9,20 +12,26 @@ stdenv.mkDerivation rec {
     url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
     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 = ''
     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
-    echo CONFIG_DRIVER_NL80211=y | tee -a .config
+    echo ${extraConfig} | tee -a .config
     echo CONFIG_LIBNL32=y | tee -a .config
     substituteInPlace Makefile --replace /usr/local $out
   '';
 
-  buildInputs = [ openssl dbus_libs libnl ];
+  buildInputs = [ openssl dbus_libs libnl ]
+    ++ lib.optional readlineSupport readline;
 
   buildNativeInputs = [ pkgconfig ];