mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge pull request #163858 from a-m-joseph/wpasupplicant-rename-dbus-option
wpa_supplicant: rename withDbus to dbusSupport
This commit is contained in:
commit
28e7df2fe3
|
@ -1,6 +1,6 @@
|
||||||
{ lib, stdenv, fetchurl, openssl, pkg-config, libnl
|
{ lib, stdenv, fetchurl, openssl, pkg-config, libnl
|
||||||
, nixosTests, wpa_supplicant_gui
|
, nixosTests, wpa_supplicant_gui
|
||||||
, withDbus ? true, dbus
|
, dbusSupport ? true, dbus
|
||||||
, withReadline ? true, readline
|
, withReadline ? true, readline
|
||||||
, withPcsclite ? true, pcsclite
|
, withPcsclite ? true, pcsclite
|
||||||
, readOnlyModeSSIDs ? false
|
, readOnlyModeSSIDs ? false
|
||||||
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
||||||
CONFIG_EAP_AKA=y
|
CONFIG_EAP_AKA=y
|
||||||
CONFIG_EAP_AKA_PRIME=y
|
CONFIG_EAP_AKA_PRIME=y
|
||||||
CONFIG_PCSC=y
|
CONFIG_PCSC=y
|
||||||
'' + optionalString withDbus ''
|
'' + optionalString dbusSupport ''
|
||||||
CONFIG_CTRL_IFACE_DBUS=y
|
CONFIG_CTRL_IFACE_DBUS=y
|
||||||
CONFIG_CTRL_IFACE_DBUS_NEW=y
|
CONFIG_CTRL_IFACE_DBUS_NEW=y
|
||||||
CONFIG_CTRL_IFACE_DBUS_INTRO=y
|
CONFIG_CTRL_IFACE_DBUS_INTRO=y
|
||||||
|
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ openssl libnl ]
|
buildInputs = [ openssl libnl ]
|
||||||
++ optional withDbus dbus
|
++ optional dbusSupport dbus
|
||||||
++ optional withReadline readline
|
++ optional withReadline readline
|
||||||
++ optional withPcsclite pcsclite;
|
++ optional withPcsclite pcsclite;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue