From f87965d13e9cc5f86232d55a0d754fcbff2d83d3 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 13 Apr 2026 21:58:39 +0200
Subject: [PATCH 1/2] xfce4-settings: enable strictDeps

bashNonInteractive is added because lib/xfce4/settings/appearance-install-theme
has a shebang that needs patching.
---
 pkgs/by-name/xf/xfce4-settings/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/xf/xfce4-settings/package.nix b/pkgs/by-name/xf/xfce4-settings/package.nix
index 0bbda06c2a25..dba22d99d135 100644
--- a/pkgs/by-name/xf/xfce4-settings/package.nix
+++ b/pkgs/by-name/xf/xfce4-settings/package.nix
@@ -18,6 +18,8 @@
   libxfce4ui,
   libxfce4util,
   libxklavier,
+  libxml2,
+  bashNonInteractive,
   withXrandr ? true,
   upower,
   # Disabled by default on upstream and actually causes issues:
@@ -44,15 +46,21 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-EAiu29wctXg0EjdFVJOl+0nh1A0l2E44v+i/o5l/PQ8=";
   };
 
+  depsBuildBuild = [
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     gettext
     pkg-config
     xfce4-dev-tools
     wayland-scanner
     wrapGAppsHook3
+    libxml2
   ];
 
   buildInputs = [
+    bashNonInteractive
     xfce4-exo
     garcon
     glib
@@ -72,6 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withUpower [ upower ]
   ++ lib.optionals withColord [ colord ];
 
+  strictDeps = true;
+
   configureFlags = [
     "--enable-maintainer-mode"
     "--enable-pluggable-dialogs"

From 0c06723b65109faf8b0e6eee10fe4c7226683fa2 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 16 Apr 2026 11:50:29 +0200
Subject: [PATCH 2/2] xfce4-settings: remove obsolete configure flags

Fixes "WARNING: unrecognized options: --enable-maintainer-mode, --enable-pluggable-dialogs"
---
 pkgs/by-name/xf/xfce4-settings/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/xf/xfce4-settings/package.nix b/pkgs/by-name/xf/xfce4-settings/package.nix
index dba22d99d135..4c19a9050f9e 100644
--- a/pkgs/by-name/xf/xfce4-settings/package.nix
+++ b/pkgs/by-name/xf/xfce4-settings/package.nix
@@ -83,8 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   configureFlags = [
-    "--enable-maintainer-mode"
-    "--enable-pluggable-dialogs"
     "--enable-sound-settings"
     (lib.enableFeature withXrandr "xrandr")
   ]