Skip to content

Commit 0541d0e

Browse files
authored
nixos/xfce: fix after NixOS#369419 removed with lib (NixOS#369745)
2 parents 34f5f7e + bef289e commit 0541d0e

File tree

1 file changed

+6
-6
lines changed
  • nixos/modules/services/x11/desktop-managers

1 file changed

+6
-6
lines changed

nixos/modules/services/x11/desktop-managers/xfce.nix

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,22 @@ in
127127
xfce.xfce4-taskmanager
128128
xfce.xfce4-terminal
129129
] # TODO: NetworkManager doesn't belong here
130-
++ optional config.networking.networkmanager.enable networkmanagerapplet
131-
++ optional config.powerManagement.enable xfce.xfce4-power-manager
132-
++ optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [
130+
++ lib.optional config.networking.networkmanager.enable networkmanagerapplet
131+
++ lib.optional config.powerManagement.enable xfce.xfce4-power-manager
132+
++ lib.optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [
133133
pavucontrol
134134
# volume up/down keys support:
135135
# xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
136136
# but can only be used with xfce4-panel, so for no-desktop usage we still include
137137
# xfce4-volumed-pulse
138138
(if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin)
139-
] ++ optionals cfg.enableXfwm [
139+
] ++ lib.optionals cfg.enableXfwm [
140140
xfce.xfwm4
141141
xfce.xfwm4-themes
142-
] ++ optionals (!cfg.noDesktop) [
142+
] ++ lib.optionals (!cfg.noDesktop) [
143143
xfce.xfce4-panel
144144
xfce.xfdesktop
145-
] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
145+
] ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
146146

147147
programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2;
148148
programs.xfconf.enable = true;

0 commit comments

Comments
 (0)