pyrox.dev
Merge commit 'refs/pull/14242/head' of git://github.com/NixOS/nixpkgs
+4
-2
pkgs/tools/networking/network-manager/default.nix
+4
-2
pkgs/tools/networking/network-manager/default.nix
···
2
, udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
3
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
4
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
5
-
, ethtool, gnused }:
6
7
stdenv.mkDerivation rec {
8
name = "network-manager-${version}";
···
14
};
15
16
preConfigure = ''
17
-
substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
18
substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
19
substituteInPlace data/85-nm-unmanaged.rules \
20
--replace /bin/sh ${stdenv.shell} \
···
2
, udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
3
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
4
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
5
+
, ethtool, gnused, coreutils, file, inetutils }:
6
7
stdenv.mkDerivation rec {
8
name = "network-manager-${version}";
···
14
};
15
16
preConfigure = ''
17
+
substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
18
+
substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
19
+
substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping
20
substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
21
substituteInPlace data/85-nm-unmanaged.rules \
22
--replace /bin/sh ${stdenv.shell} \