Merge #29392: gnome3: 3.24 -> 3.26

It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.

1 files changed, 10 insertions, 6 deletions

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index 618d6152d81f..c13d7e976e5c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, evolution_data_server, sqlite, libxml2, libsoup
+{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook
+, gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup
 , glib, gnome_online_accounts, gsettings_desktop_schemas }:
 
 stdenv.mkDerivation rec {
@@ -7,13 +7,17 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];
   buildInputs = [
-    gtk3 wrapGAppsHook intltool evolution_data_server
-    sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts
-    gsettings_desktop_schemas
+    gtk evolution_data_server libsoup glib gnome_online_accounts
+    gsettings_desktop_schemas gnome3.defaultIconTheme
   ];
 
+  postPatch = ''
+    chmod +x meson_post_install.py # patchShebangs requires executable file
+    patchShebangs meson_post_install.py
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Calendar;
     description = "Simple and beautiful calendar application for GNOME";