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

networkmanager: cleanup

Browse Source
This commit is contained in:
Alexander Ried 2016-06-22 13:49:26 +02:00
parent c1319572d4
commit 64a9dc4dd7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz { stdenv, fetchurl, intltool, pkgconfig, dbus_glib
, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables
, libgcrypt, dnsmasq, bind, perl, bluez5, substituteAll, readline , libgcrypt, dnsmasq, bluez5, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused, coreutils, file, inetutils }: , ethtool, gnused, coreutils, file, inetutils }:
@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
"--with-dhclient=${dhcp}/bin/dhclient" "--with-dhclient=${dhcp}/bin/dhclient"
"--with-dnsmasq=${dnsmasq}/bin/dnsmasq" "--with-dnsmasq=${dnsmasq}/bin/dnsmasq"
# Upstream prefers dhclient, so don't add dhcpcd to the closure # Upstream prefers dhclient, so don't add dhcpcd to the closure
#"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"
"--with-dhcpcd=no" "--with-dhcpcd=no"
"--with-pppd=${ppp}/bin/pppd" "--with-pppd=${ppp}/bin/pppd"
"--with-iptables=${iptables}/bin/iptables" "--with-iptables=${iptables}/bin/iptables"
@ -55,8 +54,8 @@ stdenv.mkDerivation rec {
"--with-libsoup=yes" "--with-libsoup=yes"
]; ];
buildInputs = [ wirelesstools systemd libgudev libnl libuuid polkit ppp libndp buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
xz bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ];
propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];