modemmanager: fix and re-enable tests

This reverts commit 2c40baad4cf2999b5ace2c87cd8196794cd64d37.
This commit is contained in:
Jan Tojnar
2022-10-11 18:52:24 +02:00
parent 8ea60018e3
commit c57078f858
+15 -3
View File
@@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl
, fetchpatch
, glib, udev, libgudev, polkit, ppp, gettext, pkg-config, python3
, libmbim, libqmi, systemd, vala, gobject-introspection, dbus
}:
@@ -12,6 +13,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-FiVfginu6y3+y43RNwNg1G8QFeyF5vulwcvZ9DcdZes=";
};
patches = [
# Fix tests with GLib 2.73.2
# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/601
(fetchpatch {
url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/79a5a4eed2189ea87d25cbe00bc824a2572cad66.patch";
sha256 = "egGXkCzAMyqPjeO6ro23sdTddTDEGJUkV7rH8sSlSGE=";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/51a333cd9a6707de7c623fd4c94cb6032477572f.patch";
sha256 = "1XyJ0GBmpBRwnsKPI4i/EBrF7W08HelL/PMDwmlQWcw=";
})
];
nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ];
buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ];
@@ -40,9 +54,7 @@ stdenv.mkDerivation rec {
# load libraries from the install path, which doesn't usually exist
# when `make check' is run. So to work around that, we run it as an
# install check instead, when those paths will have been created.
# Failing with GLib 2.73.2
# https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/601
doInstallCheck = false;
doInstallCheck = true;
preInstallCheck = ''
export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon"
patchShebangs tools/tests/test-wrapper.sh