public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68983 from worldofpeace/xfce-cleanup

Browse Source 
Touchups for nixos/xfce4-14 for 19.09
This commit is contained in:
worldofpeace 2019-09-19 13:25:03 -04:00 committed by GitHub
commit 1e6f4fb2bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/x11/desktop-managers/xfce4-14.nix
View File

@ -53,6 +53,7 @@ in
glib # for gsettings glib # for gsettings
gtk3.out # gtk-update-icon-cache gtk3.out # gtk-update-icon-cache
gnome3.gnome-themes-extra
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
hicolor-icon-theme hicolor-icon-theme
tango-icon-theme tango-icon-theme
@ -69,16 +70,17 @@ in
exo exo
garcon garcon
gtk-xfce-engine
libxfce4ui libxfce4ui
xfconf xfconf
mousepad mousepad
parole
ristretto ristretto
xfce4-appfinder xfce4-appfinder
xfce4-screenshooter xfce4-screenshooter
xfce4-session xfce4-session
xfce4-settings xfce4-settings
xfce4-taskmanager
xfce4-terminal xfce4-terminal
# TODO: resync patch for plugins # TODO: resync patch for plugins
@ -86,12 +88,16 @@ in
thunar thunar
] # TODO: NetworkManager doesn't belong here ] # TODO: NetworkManager doesn't belong here
++ optional config.networking.networkmanager.enable networkmanagerapplet ++ optional config.networking.networkmanager.enable networkmanagerapplet
++ optional config.hardware.pulseaudio.enable xfce4-pulseaudio-plugin
++ optional config.powerManagement.enable xfce4-power-manager ++ optional config.powerManagement.enable xfce4-power-manager
++ optional cfg.enableXfwm xfwm4 ++ optionals config.hardware.pulseaudio.enable [
++ optionals (!cfg.noDesktop) [ pavucontrol
xfce4-panel xfce4-pulseaudio-plugin
] ++ optionals cfg.enableXfwm [
xfwm4
xfwm4-themes
] ++ optionals (!cfg.noDesktop) [
xfce4-notifyd xfce4-notifyd
xfce4-panel
xfdesktop xfdesktop
]; ];

7
pkgs/desktops/xfce4-14/default.nix
View File

@ -93,8 +93,6 @@ makeScope newScope (self: with self; {
## COMMON PARTS WITH XFCE 4.12 ## COMMON PARTS WITH XFCE 4.12
gtk-xfce-engine = callPackage ../xfce/core/gtk-xfce-engine.nix { withGtk3 = false; };
xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { }; xfce4-icon-theme = callPackage ../xfce/art/xfce4-icon-theme.nix { };
xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { }; xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { };
@ -113,7 +111,6 @@ makeScope newScope (self: with self; {
## ALIASES ## ALIASES
xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18
# added 2019-08-18 gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17
xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin";
}) })

1
pkgs/top-level/aliases.nix
View File

@ -388,6 +388,7 @@ mapAliases ({
winusb = woeusb; # added 2017-12-22 winusb = woeusb; # added 2017-12-22
wireguard = wireguard-tools; # added 2018-05-19 wireguard = wireguard-tools; # added 2018-05-19
morituri = whipper; # added 2018-09-13 morituri = whipper; # added 2018-09-13
xfceUnstable = xfce4-14; # added 2019-09-17
x11 = xlibsWrapper; # added 2015-09 x11 = xlibsWrapper; # added 2015-09
xbmc = kodi; # added 2018-04-25 xbmc = kodi; # added 2018-04-25
xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25

1
pkgs/top-level/all-packages.nix
View File

@ -22709,7 +22709,6 @@ in
solarc-gtk-theme = callPackage ../misc/themes/solarc { }; solarc-gtk-theme = callPackage ../misc/themes/solarc { };
xfce = xfce4-12; xfce = xfce4-12;
xfceUnstable = xfce4-14;
xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { }); xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });
xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { }); xfce4-14 = recurseIntoAttrs (callPackage ../desktops/xfce4-14 { });