xfconf: Move to top-level
This commit is contained in:
@@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
xset,
|
||||
xautolock,
|
||||
xscreensaver,
|
||||
xfce,
|
||||
xfconf,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
@@ -74,7 +74,7 @@ python3Packages.buildPythonApplication rec {
|
||||
procps
|
||||
xautolock
|
||||
xscreensaver
|
||||
xfce.xfconf
|
||||
xfconf
|
||||
xset
|
||||
]
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user