about summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/misc
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-01-13 03:40:57 -0500
committerworldofpeace <worldofpeace@users.noreply.github.com>2019-01-13 03:43:15 -0500
commitb3687441aa3b8527a436a971f113fecea9ccf71b (patch)
treead6f73f0972b65aafe8acbefbef292f688ae0d2b /pkgs/desktops/gnome-3/misc
parent955a9959ac8789999662b7c247f34bb391e16755 (diff)
downloadnixlib-b3687441aa3b8527a436a971f113fecea9ccf71b.tar
nixlib-b3687441aa3b8527a436a971f113fecea9ccf71b.tar.gz
nixlib-b3687441aa3b8527a436a971f113fecea9ccf71b.tar.bz2
nixlib-b3687441aa3b8527a436a971f113fecea9ccf71b.tar.lz
nixlib-b3687441aa3b8527a436a971f113fecea9ccf71b.tar.xz
nixlib-b3687441aa3b8527a436a971f113fecea9ccf71b.tar.zst
nixlib-b3687441aa3b8527a436a971f113fecea9ccf71b.zip
geary: fix build
Apply upstream patch that adapts to changes in latest vala.

Closes https://github.com/NixOS/nixpkgs/issues/53864
Diffstat (limited to 'pkgs/desktops/gnome-3/misc')
-rw-r--r--pkgs/desktops/gnome-3/misc/geary/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 0841fa13a73f..8f1080ccc2e0 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -30,6 +30,12 @@ stdenv.mkDerivation rec {
       url = https://gitlab.gnome.org/GNOME/geary/commit/e091f24b00ec421e1aadd5e360d1550e658ad5ef.patch;
       sha256 = "0d5hc4h9c1hnn2sk18nkpmzdvwm3h746n2zj8n22ax9rj6lxl38l";
     })
+    # Fix build with vala 0.40.12
+    # See: https://gitlab.gnome.org/GNOME/vala/blob/0.40.12/NEWS#L22
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/geary/commit/088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45.patch";
+      sha256 = "0cnjmbd3snm8ggmprqa32f7i3w86gs3ylab9p5ffj921dcpvvlb2";
+    })
   ];
 
   nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobject-introspection ];