Skip to content

Commit 9b996f7

Browse files
SuperSandro2000bobby285271
authored andcommitted
nixos/xfce: Fix ambiguous with
Pull request 345352 introduces `pkgs.exo`, don't pick up that package.
1 parent 73bed75 commit 9b996f7

File tree

1 file changed

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

1 file changed

+23
-23
lines changed

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ in
8080
};
8181

8282
config = mkIf cfg.enable {
83-
environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [
83+
environment.systemPackages = utils.removePackagesByName (with pkgs; [
8484
glib # for gsettings
8585
gtk3.out # gtk-update-icon-cache
8686

8787
gnome-themes-extra
8888
adwaita-icon-theme
8989
hicolor-icon-theme
9090
tango-icon-theme
91-
xfce4-icon-theme
91+
xfce.xfce4-icon-theme
9292

9393
desktop-file-utils
9494
shared-mime-info # for update-mime-database
@@ -99,37 +99,37 @@ in
9999
# Needed by Xfce's xinitrc script
100100
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
101101

102-
exo
103-
garcon
104-
libxfce4ui
105-
106-
mousepad
107-
parole
108-
ristretto
109-
xfce4-appfinder
110-
xfce4-notifyd
111-
xfce4-screenshooter
112-
xfce4-session
113-
xfce4-settings
114-
xfce4-taskmanager
115-
xfce4-terminal
102+
xfce.exo
103+
xfce.garcon
104+
xfce.libxfce4ui
105+
106+
xfce.mousepad
107+
xfce.parole
108+
xfce.ristretto
109+
xfce.xfce4-appfinder
110+
xfce.xfce4-notifyd
111+
xfce.xfce4-screenshooter
112+
xfce.xfce4-session
113+
xfce.xfce4-settings
114+
xfce.xfce4-taskmanager
115+
xfce.xfce4-terminal
116116
] # TODO: NetworkManager doesn't belong here
117117
++ optional config.networking.networkmanager.enable networkmanagerapplet
118-
++ optional config.powerManagement.enable xfce4-power-manager
118+
++ optional config.powerManagement.enable xfce.xfce4-power-manager
119119
++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
120120
pavucontrol
121121
# volume up/down keys support:
122122
# xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
123123
# but can only be used with xfce4-panel, so for no-desktop usage we still include
124124
# xfce4-volumed-pulse
125-
(if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
125+
(if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin)
126126
] ++ optionals cfg.enableXfwm [
127-
xfwm4
128-
xfwm4-themes
127+
xfce.xfwm4
128+
xfce.xfwm4-themes
129129
] ++ optionals (!cfg.noDesktop) [
130-
xfce4-panel
131-
xfdesktop
132-
] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
130+
xfce.xfce4-panel
131+
xfce.xfdesktop
132+
] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
133133

134134
programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
135135
programs.xfconf.enable = true;

0 commit comments

Comments
 (0)