diff options
| author | Peter Hoeg <peter@speartail.com> | 2016-03-22 00:04:49 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@speartail.com> | 2016-03-27 15:15:16 +0800 |
| commit | 8857774f91b99b49aa5348c550e40bb71f472de1 (patch) | |
| tree | de4e42d73be0d52a1967525ae9513a5ee5626219 /pkgs/tools/networking/network-manager/default.nix | |
| parent | e781a8257b4312f6b138c7d0511c77d8c06ed819 (diff) | |
| download | nixlib-8857774f91b99b49aa5348c550e40bb71f472de1.tar nixlib-8857774f91b99b49aa5348c550e40bb71f472de1.tar.gz nixlib-8857774f91b99b49aa5348c550e40bb71f472de1.tar.bz2 nixlib-8857774f91b99b49aa5348c550e40bb71f472de1.tar.lz nixlib-8857774f91b99b49aa5348c550e40bb71f472de1.tar.xz nixlib-8857774f91b99b49aa5348c550e40bb71f472de1.tar.zst nixlib-8857774f91b99b49aa5348c550e40bb71f472de1.zip | |
network-manager: use ping/ping6 from the nix store
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
Diffstat (limited to 'pkgs/tools/networking/network-manager/default.nix')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index c23b818e048f..6c5a91fd4ded 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -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} \ |