gnu: network-manager: Patch dlopen call to libjansson.so.

* gnu/packages/gnome.scm (network-manager)[phases]
{patch-dlopen-call-to-libjansson}: New phase.
{pre-configure}: Reinstate an assertion in test-setting.c.
This commit is contained in:
Maxim Cournoyer 2022-01-10 23:08:06 -05:00
parent a02c1ce716
commit b8a771d5a5
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -7841,6 +7841,13 @@ (define-public network-manager
(string-append "-Ddhclient=" dhclient)))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-dlopen-call-to-libjansson.so
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/libnm-glib-aux/nm-json-aux.c"
(("(handle = dlopen\\()soname" _ head)
(string-append
head "\"" (search-input-file inputs
"lib/libjansson.so") "\"")))))
(add-before 'configure 'pre-configure
(lambda _
;; These tests try to test aspects of network-manager's
@ -7859,12 +7866,7 @@ (define-public network-manager
((".*test-link-linux.*") "")
((".*test-lldp.*") "")
((".*test-route-linux.*") "")
((".*test-tc-linux.*") ""))
;; FIXME: The jansson check fails (see:
;; https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/837
(substitute* "src/libnm-core-impl/tests/test-setting.c"
(("g_assert\\(nm_json_vt\\(\\)\\);")
"return TRUE;"))))
((".*test-tc-linux.*") ""))))
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")