diff options
author | misuzu <bakalolka@gmail.com> | 2021-06-27 19:36:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-27 18:36:16 +0200 |
commit | edba976506ba7dca308e7b01b554676b263534f6 (patch) | |
tree | 344b4b9b0d71321f0c8970c40cd3bf4cd0029314 /pkgs | |
parent | 538bd1dd98ff395bec598d56cdbe6046f0f0891d (diff) | |
download | nixpkgs-edba976506ba7dca308e7b01b554676b263534f6.tar nixpkgs-edba976506ba7dca308e7b01b554676b263534f6.tar.gz nixpkgs-edba976506ba7dca308e7b01b554676b263534f6.tar.bz2 nixpkgs-edba976506ba7dca308e7b01b554676b263534f6.tar.lz nixpkgs-edba976506ba7dca308e7b01b554676b263534f6.tar.xz nixpkgs-edba976506ba7dca308e7b01b554676b263534f6.tar.zst nixpkgs-edba976506ba7dca308e7b01b554676b263534f6.zip |
wpa_supplicant: allow disabling pcsclite dependency (#128182)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/wpa_supplicant/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 51af6abde8c..1dbe281e096 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl -, dbus, readline ? null, pcsclite ? null - +, withDbus ? true, dbus +, withReadline ? true, readline +, withPcsclite ? true, pcsclite , readOnlyModeSSIDs ? false }: @@ -87,16 +88,16 @@ stdenv.mkDerivation rec { CONFIG_TDLS=y CONFIG_BGSCAN_SIMPLE=y CONFIG_BGSCAN_LEARN=y - '' + optionalString (pcsclite != null) '' + '' + optionalString withPcsclite '' CONFIG_EAP_SIM=y CONFIG_EAP_AKA=y CONFIG_EAP_AKA_PRIME=y CONFIG_PCSC=y - '' + optionalString (dbus != null) '' + '' + optionalString withDbus '' CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y - '' + (if readline != null then '' + '' + (if withReadline then '' CONFIG_READLINE=y '' else '' CONFIG_WPA_CLI_EDIT=y @@ -113,10 +114,13 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/local $out export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ -I$(echo "${lib.getDev libnl}"/include/libnl*/) \ - -I${lib.getDev pcsclite}/include/PCSC/" + ${optionalString withPcsclite "-I${lib.getDev pcsclite}/include/PCSC/"}" ''; - buildInputs = [ openssl libnl dbus readline pcsclite ]; + buildInputs = [ openssl libnl ] + ++ optional withDbus dbus + ++ optional withReadline readline + ++ optional withPcsclite pcsclite; nativeBuildInputs = [ pkg-config ]; |