From 766a245dbcda372e9231d643cb5466dee6299473 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 20 Sep 2022 14:43:38 +0200
Subject: [PATCH] gnome.gnome-contacts: Use GTK 4 variants of dependencies

It does not really matter for e-d-s since contacts have libedataserverui
usage commented out but we are aiming for not using gtk3 variant of e-d-s
on the NixOS ISO.

Also remove propagatedUserEnvPkgs since they are an anti-pattern.
---
 pkgs/desktops/gnome/core/gnome-contacts/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix
index fb3677f84829..4a1847126090 100644
--- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , gettext
 , fetchurl
-, evolution-data-server
+, evolution-data-server-gtk4
 , pkg-config
 , libxslt
 , docbook-xsl-nons
@@ -13,7 +13,7 @@
 , libportal-gtk4
 , gnome-desktop
 , gnome-online-accounts
-, wrapGAppsHook
+, wrapGAppsHook4
 , folks
 , libxml2
 , gnome
@@ -33,10 +33,6 @@ stdenv.mkDerivation rec {
     sha256 = "Hoyo2nF429WpIQJVBkokvdwz35WFx1hOExBxTJprjco=";
   };
 
-  propagatedUserEnvPkgs = [
-    evolution-data-server
-  ];
-
   nativeBuildInputs = [
     meson
     ninja
@@ -47,14 +43,14 @@ stdenv.mkDerivation rec {
     docbook-xsl-nons
     docbook_xml_dtd_42
     desktop-file-utils
-    wrapGAppsHook
+    wrapGAppsHook4
   ];
 
   buildInputs = [
     gtk4
     glib
     libportal-gtk4
-    evolution-data-server
+    evolution-data-server-gtk4
     gsettings-desktop-schemas
     folks
     gnome-desktop