summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Ried <ried@mytum.de>2016-06-22 13:49:26 +0200
committerAlexander Ried <ried@mytum.de>2016-06-23 23:12:41 +0200
commit64a9dc4dd7f6a00d05c1e855daead0b692e0e981 (patch)
tree686ca7458225644adb3e53f957ec19879ac95b82
parentc1319572d4d32297588c95234b37f73abab50d85 (diff)
downloadnixpkgs-64a9dc4dd7f6a00d05c1e855daead0b692e0e981.tar
nixpkgs-64a9dc4dd7f6a00d05c1e855daead0b692e0e981.tar.gz
nixpkgs-64a9dc4dd7f6a00d05c1e855daead0b692e0e981.tar.bz2
nixpkgs-64a9dc4dd7f6a00d05c1e855daead0b692e0e981.tar.lz
nixpkgs-64a9dc4dd7f6a00d05c1e855daead0b692e0e981.tar.xz
nixpkgs-64a9dc4dd7f6a00d05c1e855daead0b692e0e981.tar.zst
nixpkgs-64a9dc4dd7f6a00d05c1e855daead0b692e0e981.zip
networkmanager: cleanup
-rw-r--r--pkgs/tools/networking/network-manager/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index d85fdadf897..63740558a27 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, 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 }:
 
@@ -38,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"
@@ -55,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 ];