From 52beb63f4ea7297b5945337c0442a96c35abd86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 27 May 2022 09:47:40 -0300 Subject: [PATCH] xfce: move legacy aliases outside the scope of xfce --- pkgs/desktops/xfce/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 8ab14656690e..294ecc6188c0 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -161,6 +161,13 @@ lib.makeScope pkgs.newScope (self: with self; { } // lib.optionalAttrs config.allowAliases { #### ALIASES + xinitrc = xfce4-session.xinitrc; # added 2019-11-04 + + thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04 + +}) // lib.optionalAttrs config.allowAliases { + #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24 thunar-build = throw "xfce.thunar-build has been removed, use xfce.thunar-bare instead"; # added 2022-05-24 thunarx-2-dev = throw "xfce.thunarx-2-dev has been removed, use xfce.thunar-bare instead"; # added 2022-05-24 @@ -209,8 +216,4 @@ lib.makeScope pkgs.newScope (self: with self; { gtksourceview = throw "xfce.gtksourceview has been removed, use gtksourceview instead"; # added 2022-05-24 dconf = throw "xfce.dconf has been removed, use dconf instead"; # added 2022-05-24 vte = throw "xfce.vte has been removed, use vte instead"; # added 2022-05-24 - - xinitrc = xfce4-session.xinitrc; # added 2019-11-04 - - thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04 -}) +}