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

networkmanager: Dependency on avahi-autoipd has been dropped.

Browse Source 
Native IPv4 link-local addressing configuration based on systemd network library is now used instead.
This commit is contained in:
Alexander Ried 2016-06-12 18:02:24 +02:00
parent a48f1472f5
commit c1319572d4
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/networking/networkmanager.nix
View File

@ -231,11 +231,6 @@ in {
users.extraUsers = [{ users.extraUsers = [{
name = "nm-openvpn"; name = "nm-openvpn";
uid = config.ids.uids.nm-openvpn; uid = config.ids.uids.nm-openvpn;
}
{
# to enable link-local connections
name = "avahi-autoipd";
uid = config.ids.uids.avahi-autoipd;
}]; }];
systemd.packages = cfg.packages; systemd.packages = cfg.packages;

3
pkgs/tools/networking/network-manager/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline , libgcrypt, dnsmasq, bind, perl, bluez5, substituteAll, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused, coreutils, file, inetutils }: , ethtool, gnused, coreutils, file, inetutils }:
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
--replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \
--replace /bin/sed ${gnused}/bin/sed --replace /bin/sed ${gnused}/bin/sed
# to enable link-local connections # to enable link-local connections
substituteInPlace src/devices/nm-device.c --replace '("avahi-autoipd", NULL, NULL)' '("avahi-autoipd", &"${avahi}/sbin/avahi-autoipd", NULL)'
configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
''; '';