nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175141 from NixOS/backport-174931-to-release-22.05

Browse Source 
[Backport release-22.05] xfce: move legacy aliases outside the scope of xfce
This commit is contained in:
José Romildo Malaquias
2022-05-28 12:22:08 -03:00
committed by GitHub
parent 7429d1dec3 4e63ae1e0f
commit 13209ddf33
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/desktops/xfce/default.nix
View File

@@ -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
})
}