summaryrefslogtreecommitdiff
path: root/gnu/packages/gnome.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-01-10 23:08:06 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-01-10 23:08:06 -0500
commitb8a771d5a50f6f33abd88b1dc8114f95f535131a (patch)
tree5f78712779772c631a60f9d8c39b71167c107baf /gnu/packages/gnome.scm
parenta02c1ce7166b0a66aa9154dbca67065f20b198d4 (diff)
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.
Diffstat (limited to 'gnu/packages/gnome.scm')
-rw-r--r--gnu/packages/gnome.scm14
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f08cff21c8..6c63b8bc59 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7841,6 +7841,13 @@ users.")
(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 @@ users.")
((".*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")