diff options
author | obadz <obadz-git@obadz.com> | 2016-06-23 23:41:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-23 23:41:44 +0100 |
commit | e13a76f97873a1f1aec5e5ba8502dbecf956f0cc (patch) | |
tree | b5ee8b6359d731bea211462c6ce8e898ecddde26 /pkgs/tools/networking/network-manager | |
parent | 24520af0faf831f977c2f38d41c757c6b24a6072 (diff) | |
parent | a6a11b3852174e6c2c1940a8a67aa96546e1054b (diff) | |
download | nixlib-e13a76f97873a1f1aec5e5ba8502dbecf956f0cc.tar nixlib-e13a76f97873a1f1aec5e5ba8502dbecf956f0cc.tar.gz nixlib-e13a76f97873a1f1aec5e5ba8502dbecf956f0cc.tar.bz2 nixlib-e13a76f97873a1f1aec5e5ba8502dbecf956f0cc.tar.lz nixlib-e13a76f97873a1f1aec5e5ba8502dbecf956f0cc.tar.xz nixlib-e13a76f97873a1f1aec5e5ba8502dbecf956f0cc.tar.zst nixlib-e13a76f97873a1f1aec5e5ba8502dbecf956f0cc.zip |
Merge pull request #16467 from groxxda/bump/networkmanager
networkmanager: cleanup
Diffstat (limited to 'pkgs/tools/networking/network-manager')
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 5b1d56c0184c..63740558a27f 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz -, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables -, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline +{ stdenv, fetchurl, intltool, pkgconfig, dbus_glib +, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables +, libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, coreutils, file, inetutils }: @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \ --replace /bin/sed ${gnused}/bin/sed # 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" ''; @@ -39,7 +38,6 @@ stdenv.mkDerivation rec { "--with-dhclient=${dhcp}/bin/dhclient" "--with-dnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure - #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd" "--with-dhcpcd=no" "--with-pppd=${ppp}/bin/pppd" "--with-iptables=${iptables}/bin/iptables" @@ -56,8 +54,8 @@ stdenv.mkDerivation rec { "--with-libsoup=yes" ]; - buildInputs = [ wirelesstools systemd libgudev libnl libuuid polkit ppp libndp - xz bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; + buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp + bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; |