TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: network-manager: Use Meson option for modprobe.

Browse source 
* gnu/packages/gnome.scm (arguments): Replace the 'patch-modprobe-path
phase with a ‘-Dmodprobe=’ configure flag.
This commit is contained in:
Tobias Geerinckx-Rice 2023-09-24 02:00:00 +02:00
parent c7ab89c664
commit bdb664f7b0
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/gnome.scm
View file

@ -8318,19 +8318,12 @@ (define-public network-manager
#$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"