mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 20:10:39 +02:00
Code Releases Activity

gnu: modem-manager: Fix build.

Browse source 
* gnu/packages/patches/modem-manager-fix-test-wrapper.patch: New file.
* gnu/packages/freedesktop.scm (modem-manager)[patches]: Use it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
This commit is contained in:
Liliana Marie Prikler 2024-11-23 08:59:46 +01:00
parent 11d07a4984
commit 82de874b1e
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
3 changed files with 39 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1858,6 +1858,7 @@ dist_patch_DATA = \
%D%/packages/patches/mpg321-CVE-2019-14247.patch \
%D%/packages/patches/mpg321-gcc-10.patch \
%D%/packages/patches/modglue-fix-build.patch \
%D%/packages/patches/modem-manager-fix-test-wrapper.patch \
%D%/packages/patches/module-init-tools-moduledir.patch \
%D%/packages/patches/monero-use-system-miniupnpc.patch \
%D%/packages/patches/mono-1.2.6-bootstrap.patch \

1
gnu/packages/freedesktop.scm
View file

@ -2149,6 +2149,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
(git-reference
(url "https://gitlab.freedesktop.org/mobile-broadband/ModemManager")
(commit version)))
(patches (search-patches "modem-manager-fix-test-wrapper.patch"))
(file-name (git-file-name name version))
(sha256
(base32

37
gnu/packages/patches/modem-manager-fix-test-wrapper.patch Normal file
View file

@ -0,0 +1,37 @@
From daa829287894273879799a383ed4dc373c6111b0 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 8 May 2024 09:49:59 +0200
Subject: [PATCH] build: prepend to LD_LIBRARY_PATH and GI_TYPELIB_PATH
In Nixpkgs packages are installed in separate prefixes.
Starting from GLib / gobject-introspection 2.80, GLib introspection data
is provided by GLib itself instead of gobject-introspection. This causes
tests failures in Nixpkgs because the GI_TYPELIB_PATH set by the build
environment was overridden, leaving it unable to find GLib:
ImportError: cannot import name GLib, introspection typelib not found
Only GI_TYPELIB_PATH needs to be preserved in our case, but I've made
the same change for LD_LIBRARY_PATH, other environments might rely on
that in a similar way.
---
tools/tests/test-wrapper.sh.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in
index fb8cd5e8d5..d6484bed60 100755
--- a/tools/tests/test-wrapper.sh.in
+++ b/tools/tests/test-wrapper.sh.in
@@ -1,5 +1,8 @@
#!/bin/sh
+export LD_LIBRARY_PATH=@abs_top_builddir@/libmm-glib"${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+export GI_TYPELIB_PATH=@abs_top_builddir@/libmm-glib"${GI_TYPELIB_PATH+:$GI_TYPELIB_PATH}"
+
# For debugging behavior of test-modemmanager-service.py, you can modify
# this line to add --log-file option
-LD_LIBRARY_PATH=@abs_top_builddir@/libmm-glib GI_TYPELIB_PATH=@abs_top_builddir@/libmm-glib @abs_top_srcdir@/tools/test-modemmanager-service.py
+exec @abs_top_srcdir@/tools/test-modemmanager-service.py
--
GitLab