diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-08 16:29:21 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-08 16:29:21 +0100 |
| commit | 3e950d584c8186239809e4d101e70e083ea9e9e0 (patch) | |
| tree | 41c652b87e2ade3290a6632b1d2db11b11ef37b5 /pkgs/desktops/gnome-3/misc/geary | |
| parent | edc3559c1ae1cd1edeff11af52ae768359b38ba6 (diff) | |
| parent | e0950ae9ad7e101c16ce8bbc28d566c75bb298fb (diff) | |
| download | nixpkgs-3e950d584c8186239809e4d101e70e083ea9e9e0.tar nixpkgs-3e950d584c8186239809e4d101e70e083ea9e9e0.tar.gz nixpkgs-3e950d584c8186239809e4d101e70e083ea9e9e0.tar.bz2 nixpkgs-3e950d584c8186239809e4d101e70e083ea9e9e0.tar.lz nixpkgs-3e950d584c8186239809e4d101e70e083ea9e9e0.tar.xz nixpkgs-3e950d584c8186239809e4d101e70e083ea9e9e0.tar.zst nixpkgs-3e950d584c8186239809e4d101e70e083ea9e9e0.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/desktops/gnome-3/misc/geary')
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/geary/default.nix | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 9077d663523..7bb54904fb0 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant , wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes -, gobjectIntrospection, libpthreadstubs, sqlite -, gnome3, librsvg, gnome-doc-utils, webkitgtk }: +, gobject-introspection, libpthreadstubs, sqlite +, gnome3, librsvg, gnome-doc-utils, webkitgtk, fetchpatch }: let pname = "geary"; @@ -16,7 +16,23 @@ stdenv.mkDerivation rec { sha256 = "01ykhkjfkprvh9kp4rzrl6xs2pqibiw44ckvqsn5cs3xy2rlq8mm"; }; - nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; + patches = [ + # Fix build with webkitgtk-2.22 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/geary/commit/5d0f711426d76f878cf9b71f7e8f785199c7cde1.patch; + sha256 = "1yifng5lfsc6wp7irmi8gjdcfig1cr0chf7rdv3asrk567nmwrsi"; + }) + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/geary/commit/0d966950a2cba888873cd3a7f4f42bb7a017dc6d.patch; + sha256 = "1y6v4fnik4w3paj9nl0yqs54998sx1zr9w3940d579p6dsa8f3fg"; + }) + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/geary/commit/e091f24b00ec421e1aadd5e360d1550e658ad5ef.patch; + sha256 = "0d5hc4h9c1hnn2sk18nkpmzdvwm3h746n2zj8n22ax9rj6lxl38l"; + }) + ]; + + nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ]; buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes |