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

wpa_supplicant: Fix config generation

Browse Source 
‘echo ${extraConfig}’ doesn't do the right thing if extraConfig
contains newlines.  This broke NixOS because CONFIG_DEBUG_SYSLOG=y
wasn't processed.
This commit is contained in:
Eelco Dolstra 2013-01-30 15:16:08 +01:00
parent e5b51648b1
commit bc4064af73
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
{ stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl { stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl
, readlineSupport ? true, readline , readlineSupport ? true, readline
}: }:
assert readlineSupport -> readline!=null;
assert readlineSupport -> readline != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1"; version = "1.1";
@ -12,21 +13,23 @@ 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" extraConfig =
"CONFIG_CTRL_IFACE_DBUS=y" ''
"CONFIG_CTRL_IFACE_DBUS_NEW=y" CONFIG_DEBUG_SYSLOG=y
"CONFIG_CTRL_IFACE_DBUS_INTRO=y" CONFIG_CTRL_IFACE_DBUS=y
"CONFIG_DRIVER_NL80211=y" CONFIG_CTRL_IFACE_DBUS_NEW=y
"CONFIG_LIBNL32=y" CONFIG_CTRL_IFACE_DBUS_INTRO=y
] ++ lib.optional readlineSupport "CONFIG_READLINE=y" CONFIG_DRIVER_NL80211=y
); CONFIG_LIBNL32=y
${stdenv.lib.optionalString readlineSupport "CONFIG_READLINE=y"}
'';
preBuild = '' preBuild = ''
cd wpa_supplicant cd wpa_supplicant
cp -v defconfig .config cp -v defconfig .config
echo ${extraConfig} | tee -a .config echo "$extraConfig" >> .config
echo CONFIG_LIBNL32=y | tee -a .config cat .config
substituteInPlace Makefile --replace /usr/local $out substituteInPlace Makefile --replace /usr/local $out
''; '';