From a95f41cad047ec00c21097b50dac07b6bfa8ca0b Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 21 Dec 2025 21:17:52 +0800
Subject: [PATCH] xfce.thunar: Move away from mkXfceDerivation

To reduce the diff when build system change comes.
mkXfceDerivation is generally pointless with meson.
---
 pkgs/desktops/xfce/core/thunar/default.nix | 44 +++++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index 23a09c001a41..acb8c43afd8a 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -1,8 +1,9 @@
 {
   stdenv,
-  mkXfceDerivation,
   lib,
+  fetchFromGitLab,
   docbook_xsl,
+  gettext,
   exo,
   gdk-pixbuf,
   gtk3,
@@ -14,25 +15,43 @@
   libxfce4util,
   libxslt,
   pcre2,
+  pkg-config,
+  xfce4-dev-tools,
   xfce4-panel,
   xfconf,
+  wrapGAppsHook3,
   withIntrospection ?
     lib.meta.availableOn stdenv.hostPlatform gobject-introspection
     && stdenv.hostPlatform.emulatorAvailable buildPackages,
   buildPackages,
   gobject-introspection,
+  gitUpdater,
 }:
 
-mkXfceDerivation {
-  category = "xfce";
+stdenv.mkDerivation (finalAttrs: {
   pname = "thunar";
   version = "4.20.6";
 
-  sha256 = "sha256-Ll1mJEkkxYGASWQ2z7GRiubNjggqeHXzgGSXQK+10qs=";
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchFromGitLab {
+    domain = "gitlab.xfce.org";
+    owner = "xfce";
+    repo = "thunar";
+    tag = "thunar-${finalAttrs.version}";
+    hash = "sha256-Ll1mJEkkxYGASWQ2z7GRiubNjggqeHXzgGSXQK+10qs=";
+  };
 
   nativeBuildInputs = [
     docbook_xsl
+    gettext
     libxslt
+    pkg-config
+    xfce4-dev-tools
+    wrapGAppsHook3
   ]
   ++ lib.optionals withIntrospection [
     gobject-introspection
@@ -53,7 +72,12 @@ mkXfceDerivation {
     xfconf
   ];
 
-  configureFlags = [ "--with-custom-thunarx-dirs-enabled" ];
+  configureFlags = [
+    "--enable-maintainer-mode"
+    "--with-custom-thunarx-dirs-enabled"
+  ];
+
+  enableParallelBuilding = true;
 
   # the desktop file … is in an insecure location»
   # which pops up when invoking desktop files that are
@@ -72,9 +96,17 @@ mkXfceDerivation {
     )
   '';
 
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "thunar-";
+    odd-unstable = true;
+  };
+
   meta = {
     description = "Xfce file manager";
+    homepage = "https://gitlab.xfce.org/xfce/thunar";
+    license = lib.licenses.gpl2Plus;
     mainProgram = "thunar";
+    platforms = lib.platforms.linux;
     teams = [ lib.teams.xfce ];
   };
-}
+})