pyrox.dev
modemmanager: run tests again
When we switched modemmanager from autotools to meson, this wasn't
updated, so it no longer found a Makefile and silently stopped running
the tests.
Fixes: 233dac2934f6 ("modemmanager: 1.18.12 → 1.20.4")
+12
-3
pkgs/tools/networking/modemmanager/default.nix
+12
-3
pkgs/tools/networking/modemmanager/default.nix
···
1
1
{ lib
2
2
, stdenv
3
3
, fetchFromGitLab
4
+
, fetchpatch
4
5
, glib
5
6
, udev
6
7
, libgudev
···
38
39
# Since /etc is the domain of NixOS, not Nix, we cannot install files there.
39
40
# But these are just placeholders so we do not need to install them at all.
40
41
./no-dummy-dirs-in-sysconfdir.patch
42
+
43
+
(fetchpatch {
44
+
name = "GI_TYPELIB_PATH.patch";
45
+
url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/daa829287894273879799a383ed4dc373c6111b0.patch";
46
+
hash = "sha256-tPQokiZO2SpTlX8xMlkWjP1AIXgoLHW3rJwnmG33z/k=";
47
+
})
41
48
];
42
49
43
50
strictDeps = true;
···
89
96
# In Nixpkgs g-ir-scanner is patched to produce absolute paths, and
90
97
# that interferes with ModemManager's tests, causing them to try to
91
98
# load libraries from the install path, which doesn't usually exist
92
-
# when `make check' is run. So to work around that, we run it as an
99
+
# when `meson test' is run. So to work around that, we run it as an
93
100
# install check instead, when those paths will have been created.
94
101
doInstallCheck = true;
95
-
preInstallCheck = ''
102
+
installCheckPhase = ''
103
+
runHook preInstallCheck
96
104
export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon"
97
105
patchShebangs tools/tests/test-wrapper.sh
106
+
mesonCheckPhase
107
+
runHook postInstallCheck
98
108
'';
99
-
installCheckTarget = "check";
100
109
101
110
meta = with lib; {
102
111
description = "WWAN modem manager, part of NetworkManager";