folks: Fix tests with e-d-s linked with libphonenumber support
This commit is contained in:
parent
428411b75d
commit
be6d79d83f
@ -1,6 +1,7 @@
|
|||||||
{ fetchurl
|
{ fetchurl
|
||||||
, lib, stdenv
|
, lib, stdenv
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
, fetchpatch
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, glib
|
, glib
|
||||||
@ -42,6 +43,15 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn";
|
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 = [
|
mesonFlags = [
|
||||||
"-Ddocs=true"
|
"-Ddocs=true"
|
||||||
"-Dtelepathy_backend=${lib.boolToString telepathySupport}"
|
"-Dtelepathy_backend=${lib.boolToString telepathySupport}"
|
||||||
@ -92,6 +102,13 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
|
# Prevents e-d-s add-contacts-stress-test from timing out
|
||||||
|
checkPhase = ''
|
||||||
|
runHook preCheck
|
||||||
|
meson test --timeout-multiplier 4
|
||||||
|
runHook postCheck
|
||||||
|
'';
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
chmod +x meson_post_install.py
|
chmod +x meson_post_install.py
|
||||||
patchShebangs meson_post_install.py
|
patchShebangs meson_post_install.py
|
||||||
|
Loading…
x
Reference in New Issue
Block a user