diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
commit | 2aa6f262cbb2052d604874223549ca44fd448a67 (patch) | |
tree | 6a70e96bb9d87365f4bcbf8c58025a0d93c96078 /pkgs/os-specific/linux/wpa_supplicant | |
parent | f9e75352cf610360d43806bb09671d013c881cc9 (diff) | |
parent | 1a52c7659dda87a8186d2a5482e49170b3989afa (diff) | |
download | nixpkgs-2aa6f262cbb2052d604874223549ca44fd448a67.tar nixpkgs-2aa6f262cbb2052d604874223549ca44fd448a67.tar.gz nixpkgs-2aa6f262cbb2052d604874223549ca44fd448a67.tar.bz2 nixpkgs-2aa6f262cbb2052d604874223549ca44fd448a67.tar.lz nixpkgs-2aa6f262cbb2052d604874223549ca44fd448a67.tar.xz nixpkgs-2aa6f262cbb2052d604874223549ca44fd448a67.tar.zst nixpkgs-2aa6f262cbb2052d604874223549ca44fd448a67.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index a69c5646d74..b3d94e26396 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,4 +1,8 @@ -{ 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"; @@ -10,19 +14,27 @@ stdenv.mkDerivation rec { sha256 = "00lyifj8cz7qyal6dy1dxbpk3g3bywvdarik8gbj9ds7zmfbwkd5"; }; + 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 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 CONFIG_LIBNL32=y | tee -a .config + echo "$extraConfig" >> .config + cat .config substituteInPlace Makefile --replace /usr/local $out ''; - buildInputs = [ openssl dbus_libs libnl ]; + buildInputs = [ openssl dbus_libs libnl ] + ++ lib.optional readlineSupport readline; nativeBuildInputs = [ pkgconfig ]; |