diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-30 15:16:08 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-30 15:17:38 +0100 |
| commit | bc4064af73bde28487c634c99ce44a9b5a23ef0d (patch) | |
| tree | bc0ea4584d423d4e84512721ea07a090608dc0d7 /pkgs | |
| parent | e5b51648b1ccb218f83c5310a3b6b00ed3bdc581 (diff) | |
wpa_supplicant: Fix config generation
‘echo ${extraConfig}’ doesn't do the right thing if extraConfig
contains newlines. This broke NixOS because CONFIG_DEBUG_SYSLOG=y
wasn't processed.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index c74fc8d634fec..3b77c7104ff92 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl , readlineSupport ? true, readline }: -assert readlineSupport -> readline!=null; + +assert readlineSupport -> readline != null; stdenv.mkDerivation rec { version = "1.1"; @@ -12,21 +13,23 @@ 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" - ); + + extraConfig = + '' + 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 + ${stdenv.lib.optionalString readlineSupport "CONFIG_READLINE=y"} + ''; preBuild = '' cd wpa_supplicant cp -v defconfig .config - echo ${extraConfig} | tee -a .config - echo CONFIG_LIBNL32=y | tee -a .config + echo "$extraConfig" >> .config + cat .config substituteInPlace Makefile --replace /usr/local $out ''; |