From bb10d574963c249c2ff6ee0d790a92ac5bc2a22f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 9 Aug 2023 09:30:29 +0000
Subject: [PATCH] =?UTF-8?q?vte:=200.72.2=20=E2=86=92=200.73.93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/vte/-/compare/0.72.2...0.73.93

New (direct) dependency cairo:

https://github.com/NixOS/nixpkgs/commit/8e488c7bba0e867a0c91533da765a6966368fa78

Upstream builds both gtk3 and gtk4 by default now, since we have separate
package for them we adjust the flags accordingly.

https://github.com/GNOME/vte/commit/fb09294b614184dae787098afcca4520bbfe856f

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 pkgs/development/libraries/vte/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix
index e02d7973c6e9..22eef874c250 100644
--- a/pkgs/development/libraries/vte/default.nix
+++ b/pkgs/development/libraries/vte/default.nix
@@ -20,6 +20,7 @@
 , gperf
 , pango
 , pcre2
+, cairo
 , fribidi
 , zlib
 , icu
@@ -30,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vte";
-  version = "0.72.2";
+  version = "0.73.93";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-95Zv0YWmmB9TlkFitxz+9+YGSVFV1vWCe3KqDdZ0HJ4=";
+    sha256 = "sha256-2t4EyN0/mntvfdD4htI+G0HevhdaFc5A86lJIdsa4K4=";
   };
 
   patches = [
@@ -64,6 +65,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    cairo
     fribidi
     gnutls
     pcre2
@@ -82,11 +84,10 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     "-Ddocs=true"
+    (lib.mesonBool "gtk3" (gtkVersion == "3"))
+    (lib.mesonBool "gtk4" (gtkVersion == "4"))
   ] ++ lib.optionals (!systemdSupport) [
     "-D_systemd=false"
-  ] ++ lib.optionals (gtkVersion == "4") [
-    "-Dgtk3=false"
-    "-Dgtk4=true"
   ] ++ lib.optionals stdenv.isDarwin [
     # -Bsymbolic-functions is not supported on darwin
     "-D_b_symbolic_functions=false"