From 6d2a11d1a423dbffc93f706caa634484ebc57fea Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 22 Aug 2023 21:05:04 +0800
Subject: [PATCH] xfce.xfce4-terminal: 1.0.4 -> 1.1.0

https://gitlab.xfce.org/apps/xfce4-terminal/-/compare/xfce4-terminal-1.0.4...xfce4-terminal-1.1.0

- Explicitly add glib.
- Format with nixpkgs-fmt.
- Clean up unneeded NIX_CFLAGS_COMPILE.
---
 .../applications/xfce4-terminal/default.nix   | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
index 74b9e8797db..5271fd6c043 100644
--- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix
@@ -1,17 +1,38 @@
-{ lib, mkXfceDerivation, gtk3, libxfce4ui, vte, xfconf, pcre2, libxslt, docbook_xml_dtd_45, docbook_xsl, nixosTests }:
+{ lib
+, mkXfceDerivation
+, glib
+, gtk3
+, libxfce4ui
+, vte
+, xfconf
+, pcre2
+, libxslt
+, docbook_xml_dtd_45
+, docbook_xsl
+, nixosTests
+}:
 
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-terminal";
-  version = "1.0.4";
+  version = "1.1.0";
 
-  sha256 = "sha256-eCb6KB9fFPuYzNLUm/yYrh+0D60ISzasnv/myStImEI=";
+  sha256 = "sha256-ilxiP1Org5/uSQOzfRgODmouH0BmK3CmCJj1kutNuII=";
 
-  nativeBuildInputs = [ libxslt docbook_xml_dtd_45 docbook_xsl ];
+  nativeBuildInputs = [
+    libxslt
+    docbook_xml_dtd_45
+    docbook_xsl
+  ];
 
-  buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ];
-
-  env.NIX_CFLAGS_COMPILE = "-I${libxfce4ui.dev}/include/xfce4";
+  buildInputs = [
+    glib
+    gtk3
+    libxfce4ui
+    vte
+    xfconf
+    pcre2
+  ];
 
   passthru.tests.test = nixosTests.terminal-emulators.xfce4-terminal;