From 21ef8d5c89281a71750cdf51ef7c8d69c52b63ed Mon Sep 17 00:00:00 2001
From: montag451 <montag451@laposte.net>
Date: Thu, 6 Jul 2017 15:14:01 +0200
Subject: network-manager: fix hard-coded path for modprobe

---
 pkgs/tools/networking/network-manager/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs/tools/networking/network-manager/default.nix')

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
-- 
cgit 1.4.1