From bdb664f7b0df111b0ff5a0f61bfca7fdb5786672 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 24 Sep 2023 02:00:00 +0200
Subject: gnu: network-manager: Use Meson option for modprobe.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/gnome.scm (arguments): Replace the 'patch-modprobe-path
phase with a ‘-Dmodprobe=’ configure flag.
---
 gnu/packages/gnome.scm | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a48cbb58f3..57519a284b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8318,19 +8318,12 @@ users.")
                         #$output "/lib/udev")
          (string-append "-Ddbus_conf_dir="
                         #$output "/etc/dbus-1/system.d")
-
+         (string-append "-Dmodprobe=" (search-input-file %build-inputs
+                                                         "bin/modprobe"))
          (string-append "-Ddhclient=" (search-input-file %build-inputs
                                                          "sbin/dhclient")))
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'patch-modprobe-path
-            (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "src/libnm-platform/nm-platform-utils.c"
-                ;; The modprobe command location is not configurable (see:
-                ;; https://gitlab.freedesktop.org/NetworkManager/
-                ;; NetworkManager/-/issues/1257).
-                (("/sbin/modprobe")
-                 (search-input-file inputs "bin/modprobe")))))
           (add-after 'unpack 'patch-dlopen-call-to-libjansson.so
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* "src/libnm-glib-aux/nm-json-aux.c"
-- 
cgit v1.2.3