b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #115123 from Pacman99/phone-evolution

Browse source 
evolution-data-server: enable phone number support
This commit is contained in:
Jan Tojnar 2021-03-14 02:27:20 +01:00 committed by GitHub
parent 98fddac2b6 be6d79d83f
commit 91574a3a39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View file

@ -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 = {

17
pkgs/development/libraries/folks/default.nix
View file

@ -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