From a6a823834b2588ae3d63ea60597f2f43b4a62bf2 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 12 Mar 2022 07:27:20 -0800 Subject: [PATCH] wpa_supplicant: rename withDbus to dbusSupport wpa_supplicant/default.nix currently uses the option "withDbus" to decide whether or not to compile with dbus support. It is the only nix package that uses this choice of name. Most other packages use dbusSupport instead. Let's rename this option to dbusSupport, so that users desiring to compile without dbus can set the option once in nixpkgs.conf and have all packages understand that directive. --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 925ec71d3fa1..1d58d47cf663 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, openssl, pkg-config, libnl , nixosTests, wpa_supplicant_gui -, withDbus ? true, dbus +, dbusSupport ? true, dbus , withReadline ? true, readline , withPcsclite ? true, pcsclite , readOnlyModeSSIDs ? false @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { CONFIG_EAP_AKA=y CONFIG_EAP_AKA_PRIME=y CONFIG_PCSC=y - '' + optionalString withDbus '' + '' + optionalString dbusSupport '' CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ openssl libnl ] - ++ optional withDbus dbus + ++ optional dbusSupport dbus ++ optional withReadline readline ++ optional withPcsclite pcsclite;