From f4b88df89df98ac7aa142b1f193f651579b2f4ae Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 16 Oct 2024 12:15:03 +0000
Subject: [PATCH] xfce.xfce4-dev-tools: 4.18.1 -> 4.20.0

https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/compare/xfce4-dev-tools-4.18.1...xfce4-dev-tools-4.20.0

The xdt-autogen script now explicitly sets aclocal macro search path via ACLOCAL_FLAGS,
referencing ${datarootdir}/aclocal, which is previously in the $dev output. Since pointing
datarootdir to $dev will result in circular dependency, I dropped the $dev output.
---
 .../xfce/core/xfce4-dev-tools/default.nix     | 74 ++++++++++++++-----
 pkgs/desktops/xfce/default.nix                |  6 +-
 2 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
index 7504c8e09d4c..f2a8e6fcd1ee 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-dev-tools/default.nix
@@ -1,27 +1,48 @@
-{ lib
-, mkXfceDerivation
-, autoreconfHook
-, libxslt
-, docbook_xsl
-, autoconf
-, automake
-, glib
-, gtk-doc
-, intltool
-, libtool
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  autoreconfHook,
+  docbook_xsl,
+  libxslt,
+  meson,
+  pkg-config,
+  wrapGAppsHook3,
+  python3,
+  autoconf,
+  automake,
+  glib,
+  gtk-doc,
+  libtool,
+  intltool,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "xfce";
+stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-dev-tools";
-  version = "4.18.1";
+  version = "4.20.0";
 
-  sha256 = "sha256-JUyFlifNVhSnIMaI9qmgCtGIgkpmzYybMfuhPgJiDOg=";
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "xfce";
+    repo = "xfce4-dev-tools";
+    rev = "xfce4-dev-tools-${finalAttrs.version}";
+    hash = "sha256-eUfNa/9ksLCKtVwBRtHaVl7Yl95tukUaDdoLNfeR+Ew=";
+  };
 
   nativeBuildInputs = [
     autoreconfHook
-    libxslt
     docbook_xsl
+    libxslt # for xsltproc
+    # x-d-t itself is not a meson project, but the xfce-do-release script wants
+    # `meson rewrite kwargs`, thus this is checked by `AC_CHECK_PROGS`.
+    meson
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    python3 # for xdt-gen-visibility
   ];
 
   propagatedBuildInputs = [
@@ -33,10 +54,23 @@ mkXfceDerivation {
     libtool
   ];
 
+  dontUseMesonConfigure = true;
+  configureFlags = [ "--enable-maintainer-mode" ];
+
+  enableParallelBuilding = true;
+
   setupHook = ./setup-hook.sh;
 
-  meta = with lib; {
-    description = "Autoconf macros and scripts to augment app build systems";
-    maintainers = with maintainers; [ ] ++ teams.xfce.members;
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "xfce4-dev-tools-";
+    odd-unstable = true;
   };
-}
+
+  meta = with lib; {
+    homepage = "https://gitlab.xfce.org/xfce/xfce4-dev-tools";
+    description = "Autoconf macros and scripts to augment app build systems";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ] ++ teams.xfce.members;
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 5d0efd28bfe9..dabfe761a7ba 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -61,11 +61,7 @@ makeScopeWithSplicing' {
 
       xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
 
-      xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
-        mkXfceDerivation = self.mkXfceDerivation.override {
-          xfce4-dev-tools = null;
-        };
-      };
+      xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { };
 
       #### APPLICATIONS