public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkManager: fix dnsmasq interaction for ad-hoc networks

Browse Source 
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.
This commit is contained in:
Bryan Gardiner 2015-08-26 12:17:08 -07:00
parent d4f7bf9c29
commit f4de446573
No known key found for this signature in database
GPG Key ID: 53EFBCA063E6183C
2 changed files with 3 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 let
cfg = config.networking.networkmanager; 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" '' configFile = writeText "NetworkManager.conf" ''
[main] [main]

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 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 ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];