diff options
| author | montag451 <montag451@laposte.net> | 2017-07-06 15:14:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-07 18:12:46 +0200 |
| commit | 21ef8d5c89281a71750cdf51ef7c8d69c52b63ed (patch) | |
| tree | 13144dab7c91040d19b6a2e072185a2fc3554143 /pkgs/tools/networking/network-manager/default.nix | |
| parent | 7e3a1a58cf8e5bf6cac5811493389953090f678a (diff) | |
| download | nixlib-21ef8d5c89281a71750cdf51ef7c8d69c52b63ed.tar nixlib-21ef8d5c89281a71750cdf51ef7c8d69c52b63ed.tar.gz nixlib-21ef8d5c89281a71750cdf51ef7c8d69c52b63ed.tar.bz2 nixlib-21ef8d5c89281a71750cdf51ef7c8d69c52b63ed.tar.lz nixlib-21ef8d5c89281a71750cdf51ef7c8d69c52b63ed.tar.xz nixlib-21ef8d5c89281a71750cdf51ef7c8d69c52b63ed.tar.zst nixlib-21ef8d5c89281a71750cdf51ef7c8d69c52b63ed.zip | |
network-manager: fix hard-coded path for modprobe
Diffstat (limited to 'pkgs/tools/networking/network-manager/default.nix')
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 3ef4188052b6..d2a51b3acc86 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { --replace /usr/bin/ping6 ${inetutils}/bin/ping substituteInPlace src/devices/nm-arping-manager.c \ --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);' - substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ @@ -43,6 +42,8 @@ stdenv.mkDerivation rec { --replace /bin/kill ${coreutils}/bin/kill substituteInPlace clients/common/nm-vpn-helpers.c \ --subst-var-by openconnect ${openconnect} + substituteInPlace src/nm-core-utils.c \ + --subst-var-by modprobeBinPath ${kmod}/bin/modprobe # to enable link-local connections configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" ''; @@ -79,6 +80,7 @@ stdenv.mkDerivation rec { url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch"; }) ./openconnect_helper_path.patch + ./modprobe.patch ]; buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp |