diff --git a/nixos/modules/programs/xfconf.nix b/nixos/modules/programs/xfconf.nix index 1788b220439c..cc9b6ddf7ac7 100644 --- a/nixos/modules/programs/xfconf.nix +++ b/nixos/modules/programs/xfconf.nix @@ -22,11 +22,11 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - pkgs.xfce.xfconf + pkgs.xfconf ]; services.dbus.packages = [ - pkgs.xfce.xfconf + pkgs.xfconf ]; }; } diff --git a/pkgs/by-name/ca/caffeine-ng/package.nix b/pkgs/by-name/ca/caffeine-ng/package.nix index bcdb14ea1a96..d166dc2297d0 100644 --- a/pkgs/by-name/ca/caffeine-ng/package.nix +++ b/pkgs/by-name/ca/caffeine-ng/package.nix @@ -13,7 +13,7 @@ xset, xautolock, xscreensaver, - xfce, + xfconf, wrapGAppsHook3, }: @@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec { procps xautolock xscreensaver - xfce.xfconf + xfconf xset ] } diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index f7cce76e7c7c..78aa2ac6d5c7 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -34,7 +34,7 @@ versionCheckHook, vulkan-loader, wayland, - xfce, + xfconf, xorg, yyjson, zlib, @@ -175,7 +175,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals xfceSupport [ # Needed for XFWM theme and XFCE Terminal font. - xfce.xfconf + xfconf ] ++ lib.optionals zfsSupport [ # Needed for zpool module diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/by-name/xf/xfconf/package.nix similarity index 100% rename from pkgs/desktops/xfce/core/xfconf/default.nix rename to pkgs/by-name/xf/xfconf/package.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 0a5ae1737a76..1809881e2284 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -49,8 +49,6 @@ makeScopeWithSplicing' { xfce4-power-manager = callPackage ./core/xfce4-power-manager { }; - xfconf = callPackage ./core/xfconf { }; - xfdesktop = callPackage ./core/xfdesktop { }; xfwm4 = callPackage ./core/xfwm4 { }; @@ -176,4 +174,5 @@ makeScopeWithSplicing' { # These aliases need to be placed outside the scope or they will shadow the attributes from parent scope. libxfce4util = lib.warnOnInstantiate "‘xfce.libxfce4util’ was moved to top-level. Please use ‘pkgs.libxfce4util’ directly" pkgs.libxfce4util; # Added on 2025-12-23 xfce4-dev-tools = lib.warnOnInstantiate "‘xfce.xfce4-dev-tools’ was moved to top-level. Please use ‘pkgs.xfce4-dev-tools’ directly" pkgs.xfce4-dev-tools; # Added on 2025-12-23 + xfconf = lib.warnOnInstantiate "‘xfce.xfconf’ was moved to top-level. Please use ‘pkgs.xfconf’ directly" pkgs.xfconf; # Added on 2025-12-23 } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index 3df3819740f2..fd4ece28a56f 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -11,6 +11,7 @@ python3Packages, wrapGAppsHook3, xfce, + xfconf, }: stdenv.mkDerivation rec { @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { keybinder3 python3Packages.python xfce.xfce4-panel - xfce.xfconf + xfconf ] ++ pythonPath;