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

gnome3.geary: 0.13.2 -> 3.32.0

Browse Source 
* make geary-attach executable
This commit is contained in:
Will Dietz 2019-03-11 09:07:13 -05:00 committed by Jan Tojnar
parent cef4340283
commit 71ae84bc0c
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,27 +1,18 @@
{ stdenv, fetchurl, fetchpatch, 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
, libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext
, 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, glib-networking }: , xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "geary"; pname = "geary";
version = "0.13.2"; version = "3.32.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1fp3zzgpkm1l4d0g5194wnriz2spxa9kgrgy98kvvffl7ac860kk"; sha256 = "1mxlzkmwzg1fyf4r1izwnskm5z681c6hiby48n606n89gjcq565j";
}; };
patches = [
# gobject-introspection is not needed
# https://gitlab.gnome.org/GNOME/geary/merge_requests/138
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/geary/commit/d2f1b1076aa942d140e83fdf03b66621c11229f5.patch;
sha256 = "1dsj4ybnibpi572w9hafm0w90jbjv7wzdl6j8d4c2qg5h7knlvfk";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils gettext itstool libxml2 meson ninja desktop-file-utils gettext itstool libxml2 meson ninja
pkgconfig vala wrapGAppsHook python3 pkgconfig vala wrapGAppsHook python3
@ -31,7 +22,7 @@ stdenv.mkDerivation rec {
adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts
gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3 gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3
libgee libnotify libsecret sqlite webkitgtk glib-networking libgee libnotify libsecret sqlite webkitgtk glib-networking
libunwind libunwind folks
]; ];
checkInputs = [ xvfb_run dbus ]; checkInputs = [ xvfb_run dbus ];
@ -43,11 +34,8 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
chmod +x build-aux/post_install.py chmod +x build-aux/post_install.py
patchShebangs build-aux/post_install.py patchShebangs build-aux/post_install.py
'';
preFixup = '' chmod +x desktop/geary-attach
# Add geary to path for geary-attach
gappsWrapperArgs+=(--prefix PATH : "$out/bin")
''; '';
doCheck = true; doCheck = true;
@ -60,6 +48,11 @@ stdenv.mkDerivation rec {
meson test -v --no-stdsplit meson test -v --no-stdsplit
''; '';
preFixup = ''
# Add geary to path for geary-attach
gappsWrapperArgs+=(--prefix PATH : "$out/bin")
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;