diff options
Diffstat (limited to 'pkgs/tools/networking/modemmanager/default.nix')
-rw-r--r-- | pkgs/tools/networking/modemmanager/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 64d61f0e323ca..d432b590c5c3f 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,8 +1,8 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , glib -, udev , libgudev , polkit , ppp @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { # Since /etc is the domain of NixOS, not Nix, we cannot install files there. # But these are just placeholders so we do not need to install them at all. ./no-dummy-dirs-in-sysconfdir.patch + + (fetchpatch { + name = "GI_TYPELIB_PATH.patch"; + url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/daa829287894273879799a383ed4dc373c6111b0.patch"; + hash = "sha256-tPQokiZO2SpTlX8xMlkWjP1AIXgoLHW3rJwnmG33z/k="; + }) ]; strictDeps = true; @@ -55,7 +61,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - udev libgudev polkit ppp @@ -89,14 +94,16 @@ stdenv.mkDerivation rec { # In Nixpkgs g-ir-scanner is patched to produce absolute paths, and # that interferes with ModemManager's tests, causing them to try to # 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 + # when `meson test' is run. So to work around that, we run it as an # install check instead, when those paths will have been created. doInstallCheck = true; - preInstallCheck = '' + installCheckPhase = '' + runHook preInstallCheck export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon" patchShebangs tools/tests/test-wrapper.sh + mesonCheckPhase + runHook postInstallCheck ''; - installCheckTarget = "check"; meta = with lib; { description = "WWAN modem manager, part of NetworkManager"; |