about summary refs log tree commit diff
diff options
context:
space:
mode:
authorjobs62 <cd-microsoft@analphabet.me>2024-06-28 15:02:19 +0000
committerGitHub <noreply@github.com>2024-06-28 23:02:19 +0800
commit8b864a70786721a201d39966829cc966159c2883 (patch)
treea33dcc29ecf91338a7cbf3c414aa015ceced0704
parent3901dc7822871a801500b646bf3fe81d97ddbb4d (diff)
xfce.xfce4-settings: add integration with colord and fix upower
See #323010 and #323159.
-rw-r--r--pkgs/desktops/xfce/core/xfce4-settings/default.nix12
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
index 2979824f12b2b..05923da38aebf 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -9,8 +9,11 @@
 , libxfce4util
 , libxklavier
 , upower
+, withUpower ? true
 , xfconf
 , xf86inputlibinput
+, colord
+, withColord ? true
 }:
 
 mkXfceDerivation {
@@ -29,15 +32,18 @@ mkXfceDerivation {
     libxfce4ui
     libxfce4util
     libxklavier
-    upower
     xf86inputlibinput
     xfconf
-  ];
+  ]
+  ++ lib.optionals withUpower [ upower ]
+  ++ lib.optionals withColord [ colord ];
 
   configureFlags = [
     "--enable-pluggable-dialogs"
     "--enable-sound-settings"
-  ];
+  ]
+  ++ lib.optionals withUpower [ "--enable-upower-glib" ]
+  ++ lib.optionals withColord [ "--enable-colord" ];
 
   meta = with lib; {
     description = "Settings manager for Xfce";