diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-14 02:27:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-14 02:27:20 +0100 |
| commit | 91574a3a39875475d295bdc594e79bb9d8919961 (patch) | |
| tree | 3d83e0d70ee6839395c8c0bfd9810aac41190709 | |
| parent | 98fddac2b6ccdf85ff2cb8c91bbf70059bc0b144 (diff) | |
| parent | be6d79d83f07f053a2f986c983cd34b4ef9fdc07 (diff) | |
Merge pull request #115123 from Pacman99/phone-evolution
evolution-data-server: enable phone number support
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/folks/default.nix | 17 |
2 files changed, 23 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index cfe8197a90bf..b943a02a56f5 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,8 +1,8 @@ { fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection -, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr -, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre -, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib -, glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }: +, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit +, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja +, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber +, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas, boost, protobuf }: stdenv.mkDerivation rec { pname = "evolution-data-server"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { glib libsoup libxml2 gtk3 gnome-online-accounts gcr p11-kit libgweather libgdata libaccounts-glib json-glib icu sqlite kerberos openldap webkitgtk glib-networking - libcanberra-gtk3 pcre + libcanberra-gtk3 pcre libphonenumber boost protobuf ]; propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ]; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { "-DENABLE_INTROSPECTION=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" + "-DWITH_PHONENUMBER=ON" ]; passthru = { 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 |