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

Merge pull request #72998 from worldofpeace/client-tests-geary

Browse Source 
gnome3.geary: add patch for longer client test timeout
This commit is contained in:
worldofpeace 2019-11-08 20:41:50 +00:00 committed by GitHub
commit b859c85ada
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/gnome-3/misc/geary/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja { stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja
, desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme
, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext , libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext, fetchpatch
, sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 , sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3
, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking , xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking
, gobject-introspection, gspell, appstream-glib, libytnef, libhandy }: , gobject-introspection, gspell, appstream-glib, libytnef, libhandy }:
@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
"-Dcontractor=true" # install the contractor file (Pantheon specific) "-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";
})
];
postPatch = '' postPatch = ''
chmod +x build-aux/post_install.py build-aux/git_version.py chmod +x build-aux/post_install.py build-aux/git_version.py
patchShebangs build-aux/post_install.py build-aux/git_version.py patchShebangs build-aux/post_install.py build-aux/git_version.py