diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-13 02:45:54 +0100 |
|---|---|---|
| committer | Pacman99 <pachum99@gmail.com> | 2021-03-13 15:53:04 -0800 |
| commit | be6d79d83f07f053a2f986c983cd34b4ef9fdc07 (patch) | |
| tree | 0c0f4908ef390b5f510c85b2811891eff2af7cd5 | |
| parent | 428411b75d8ab8ccfc7e2b34865ab5491c2a7633 (diff) | |
folks: Fix tests with e-d-s linked with libphonenumber support
| -rw-r--r-- | pkgs/development/libraries/folks/default.nix | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 955b7e0d16f9..c930adbe9b2d 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -1,6 +1,7 @@ { fetchurl , lib, stdenv , pkg-config +, fetchpatch , meson , ninja , glib @@ -42,6 +43,15 @@ stdenv.mkDerivation rec { sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; }; + patches = [ + # Fix tests with e-d-s linked with libphonenumber support + # https://gitlab.gnome.org/GNOME/folks/merge_requests/40 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/folks/commit/6d443480a137f6a6ff345b21bf3cb31066eefbcd.patch"; + sha256 = "D/Y2g12TT0qrcH+iJ2umu4Hmp0EJ3Hoedh0H3aWI+HY="; + }) + ]; + mesonFlags = [ "-Ddocs=true" "-Dtelepathy_backend=${lib.boolToString telepathySupport}" @@ -92,6 +102,13 @@ stdenv.mkDerivation rec { doCheck = true; + # Prevents e-d-s add-contacts-stress-test from timing out + checkPhase = '' + runHook preCheck + meson test --timeout-multiplier 4 + runHook postCheck + ''; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py |