public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome3.gnome-contacts: 3.34.1 -> 3.36

Browse Source 
Disable telepathy support as it makes the build fail. This is also done
in fedora, and the options seems not well supported.
This commit is contained in:
Tor Hedin Brønner 2020-02-09 01:35:31 +01:00 committed by Jan Tojnar
parent ad30622ae6
commit 77bdc11874
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, gettext, fetchurl, evolution-data-server, fetchpatch { stdenv, gettext, fetchurl, evolution-data-server, fetchpatch
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib , wrapGAppsHook, folks, libxml2, gnome3
, vala, meson, ninja, libhandy, gsettings-desktop-schemas }: , vala, meson, ninja, libhandy, gsettings-desktop-schemas
# , telepathy-glib
}:
let stdenv.mkDerivation rec {
version = "3.34.1";
in stdenv.mkDerivation rec {
pname = "gnome-contacts"; pname = "gnome-contacts";
inherit version; version = "3.36";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1jqw5yrypvjxzgg70vjbryylwx06amg6sg85mqi14a97xbccg0qa"; sha256 = "0yvgsfmqm8dxbhay12m20xp6qi9v31wwyv1gz4fx7j4kklhd5jzf";
}; };
propagatedUserEnvPkgs = [ evolution-data-server ]; propagatedUserEnvPkgs = [ evolution-data-server ];
@ -23,16 +23,15 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib evolution-data-server gsettings-desktop-schemas gtk3 glib evolution-data-server gsettings-desktop-schemas
folks gnome-desktop telepathy-glib libhandy folks gnome-desktop libhandy
libxml2 gnome-online-accounts cheese libxml2 gnome-online-accounts cheese
gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib
# telepathy-glib 3.35.90 fails to build with telepathy
]; ];
mesonFlags = [ mesonFlags = [
"-Dtelepathy=true" # Upstream does not seem to maintain this properly: https://gitlab.gnome.org/GNOME/gnome-contacts/issues/103
]; "-Dtelepathy=false"
patches = [
]; ];
postPatch = '' postPatch = ''