diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix | 119 |
1 files changed, 93 insertions, 26 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix index 0326e38aba76..6390b03efa31 100644 --- a/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,46 +1,113 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja -, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme -, libpeas, libsecret, gmime3, isocodes, libxml2, gettext, fetchpatch -, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 -, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking -, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }: +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, gtk3 +, vala +, enchant2 +, wrapGAppsHook +, meson +, ninja +, desktop-file-utils +, gnome-online-accounts +, gsettings-desktop-schemas +, adwaita-icon-theme +, libpeas +, libsecret +, gmime3 +, isocodes +, libxml2 +, gettext +, sqlite +, gcr +, json-glib +, itstool +, libgee +, gnome3 +, webkitgtk +, python3 +, gnutls +, cacert +, xvfb_run +, glibcLocales +, dbus +, shared-mime-info +, libunwind +, folks +, glib-networking +, gobject-introspection +, gspell +, appstream-glib +, libytnef +, libhandy +, gsound +}: stdenv.mkDerivation rec { pname = "geary"; - version = "3.36.2"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09l2lbcn3ar3scw6iylmdqi1lhpb408iqs6056d0wzx2l9nkmqis"; + sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7"; }; + patches = [ + # Longer timeout for client test. + ./Bump-client-test-timeout-to-300s.patch + ]; + nativeBuildInputs = [ - desktop-file-utils gettext itstool libxml2 meson ninja - pkgconfig vala wrapGAppsHook python3 appstream-glib + appstream-glib + desktop-file-utils + gettext gobject-introspection + itstool + libxml2 + meson + ninja + pkgconfig + python3 + vala + wrapGAppsHook ]; buildInputs = [ - adwaita-icon-theme enchant2 gcr gmime3 gnome-online-accounts - gsettings-desktop-schemas gtk3 isocodes json-glib libpeas - libgee libsecret sqlite webkitgtk glib-networking - libunwind folks gspell libytnef libhandy + adwaita-icon-theme + enchant2 + folks + gcr + glib-networking + gmime3 + gnome-online-accounts + gsettings-desktop-schemas + gsound + gspell + gtk3 + isocodes + json-glib + libgee + libhandy + libpeas + libsecret + libunwind + libytnef + sqlite + webkitgtk ]; - checkInputs = [ xvfb_run dbus ]; + checkInputs = [ + dbus + gnutls # for certtool + cacert # trust store for glib-networking + xvfb_run + glibcLocales # required by Geary.ImapDb.DatabaseTest/utf8_case_insensitive_collation + ]; mesonFlags = [ "-Dcontractor=true" # install the contractor file (Pantheon specific) ]; - patches = [ - # Longer timeout for client test. - (fetchpatch { - url = "https://salsa.debian.org/gnome-team/geary/raw/04be1e058a2e65075dd8cf8843d469ee45a9e09a/debian/patches/Bump-client-test-timeout-to-300s.patch"; - sha256 = "1zvnq8bgla160531bjdra8hcg15mp8r1j1n53m1xfgm0ssnj5knx"; - }) - ]; - # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa postPatch = '' @@ -54,12 +121,12 @@ stdenv.mkDerivation rec { chmod +x desktop/geary-attach ''; - # FIXME: fix tests - doCheck = false; + doCheck = true; checkPhase = '' NO_AT_BRIDGE=1 \ - XDG_DATA_DIRS=:$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share \ + GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \ + XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ meson test -v --no-stdsplit |