From 5bcec7642fcfc3dec003db62f7634d811e28ed90 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 17 Sep 2019 16:40:00 -0400 Subject: [PATCH] nixos/xfce4-14: remove gtk-xfce-engine Xfce 4.14 deprecated this. It had many gtk2 themes that don't work that confused users #68977. --- nixos/modules/services/x11/desktop-managers/xfce4-14.nix | 1 - pkgs/desktops/xfce4-14/default.nix | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix index 57d1268d655a..ae7ee322c643 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce4-14.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce4-14.nix @@ -69,7 +69,6 @@ in exo garcon - gtk-xfce-engine libxfce4ui xfconf diff --git a/pkgs/desktops/xfce4-14/default.nix b/pkgs/desktops/xfce4-14/default.nix index 294dfa92c798..0e2c8c1696b2 100644 --- a/pkgs/desktops/xfce4-14/default.nix +++ b/pkgs/desktops/xfce4-14/default.nix @@ -93,8 +93,6 @@ makeScope newScope (self: with self; { ## 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 { }; xfwm4-themes = callPackage ../xfce/art/xfwm4-themes.nix { }; @@ -113,7 +111,6 @@ makeScope newScope (self: with self; { ## ALIASES - - # added 2019-08-18 - xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; + xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 + gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 })