gnu: network-manager: Use Meson option for modprobe.
* gnu/packages/gnome.scm (arguments): Replace the 'patch-modprobe-path phase with a ‘-Dmodprobe=’ configure flag.
This commit is contained in:
parent
c7ab89c664
commit
bdb664f7b0
|
@ -8318,19 +8318,12 @@ (define-public network-manager
|
||||||
#$output "/lib/udev")
|
#$output "/lib/udev")
|
||||||
(string-append "-Ddbus_conf_dir="
|
(string-append "-Ddbus_conf_dir="
|
||||||
#$output "/etc/dbus-1/system.d")
|
#$output "/etc/dbus-1/system.d")
|
||||||
|
(string-append "-Dmodprobe=" (search-input-file %build-inputs
|
||||||
|
"bin/modprobe"))
|
||||||
(string-append "-Ddhclient=" (search-input-file %build-inputs
|
(string-append "-Ddhclient=" (search-input-file %build-inputs
|
||||||
"sbin/dhclient")))
|
"sbin/dhclient")))
|
||||||
#:phases
|
#:phases
|
||||||
#~(modify-phases %standard-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
|
(add-after 'unpack 'patch-dlopen-call-to-libjansson.so
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
(substitute* "src/libnm-glib-aux/nm-json-aux.c"
|
(substitute* "src/libnm-glib-aux/nm-json-aux.c"
|
||||||
|
|
Loading…
Reference in a new issue