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

network-manager: use ping/ping6 from the nix store

Browse Source 
NM upstream has a hardcoded path to /usr/bin/ping.

This patch changes:

 - ping/ping6 are now from the nix store
 - we no longer try to make substitutions on a missing file
 - we use file from the nix store
This commit is contained in:
Peter Hoeg 2016-03-22 00:04:49 +08:00
parent e781a8257b
commit 8857774f91
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
, ethtool, gnused }:
, ethtool, gnused, coreutils, file, inetutils }:
stdenv.mkDerivation rec {
name = "network-manager-${version}";
@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
};
preConfigure = ''
substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping
substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
substituteInPlace data/85-nm-unmanaged.rules \
--replace /bin/sh ${stdenv.shell} \