From f4de446573887d6241bbd64ad3e7a67c336a4aee Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Wed, 26 Aug 2015 12:17:08 -0700 Subject: [PATCH 1/2] NetworkManager: fix dnsmasq interaction for ad-hoc networks Fixes #7593 (NM can't find the dnsmasq binary); the NM expression is missing dnsmasq in its buildInputs, so configure can't find it. Also creates /var/lib/misc which dnsmasq expects to exist, because it puts dnsmasq.leases there. --- nixos/modules/services/networking/networkmanager.nix | 3 ++- pkgs/tools/networking/network-manager/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index adbc6099c95..c232bc3aaec 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -6,7 +6,8 @@ with lib; let cfg = config.networking.networkmanager; - stateDirs = "/var/lib/NetworkManager /var/lib/dhclient"; + # /var/lib/misc is for dnsmasq.leases. + stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; configFile = writeText "NetworkManager.conf" '' [main] diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index cc914d6616c..37c417cec14 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp - xz bluez5 gobjectIntrospection modemmanager readline newt libsoup ]; + xz bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; From 3d93890c7e968320e6d7ecf351ec64eee41cfba8 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Wed, 26 Aug 2015 14:35:49 -0700 Subject: [PATCH 2/2] wpa_supplicant: enable AP mode for NetworkManager connection sharing --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index ccfe396bf55..ddd7ec26f95 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { # TODO: Patch epoll so that the dbus actually responds # TODO: Figure out how to get privsep working, currently getting SIGBUS extraConfig = '' + CONFIG_AP=y CONFIG_LIBNL32=y CONFIG_EAP_FAST=y CONFIG_EAP_PWD=y