MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #9463 from khumba/nm-connection-sharing

Browse source 
Fix NetworkManager connection sharing
This commit is contained in:
Domen Kožar 2015-11-06 11:16:50 +01:00
commit 07405ee187
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/networking/networkmanager.nix
View file

@ -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]

1
pkgs/os-specific/linux/wpa_supplicant/default.nix
View file

@ -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

2
pkgs/tools/networking/network-manager/default.nix
View file

@ -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 ];