lxde: refactor

To be more in line with the other desktops. Indeed it is strange to look at all
those lxde packages spread over all-packages.nix.
This commit is contained in:
AndersonTorres
2022-05-07 19:05:38 -03:00
parent f8a27ed69a
commit c268cb0725
3 changed files with 34 additions and 18 deletions
+23
View File
@@ -0,0 +1,23 @@
{ config, lib, pkgs }:
lib.makeScope pkgs.newScope (self: with self; {
lxappearance = callPackage ./core/lxappearance { };
lxappearance-gtk2 = callPackage ./core/lxappearance {
gtk2 = gtk2-x11;
withGtk3 = false;
};
lxmenu-data = callPackage ./core/lxmenu-data { };
lxpanel = callPackage ./core/lxpanel {
gtk2 = gtk2-x11;
};
lxrandr = callPackage ./core/lxrandr { };
lxsession = callPackage ./core/lxsession { };
lxtask = callPackage ./core/lxtask { };
})
+11 -18
View File
@@ -32493,24 +32493,17 @@ with pkgs;
### DESKTOPS/LXDE
lxappearance = callPackage ../desktops/lxde/core/lxappearance { };
lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance {
gtk2 = gtk2-x11;
withGtk3 = false;
};
lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
lxpanel = callPackage ../desktops/lxde/core/lxpanel {
gtk2 = gtk2-x11;
};
lxrandr = callPackage ../desktops/lxde/core/lxrandr { };
lxsession = callPackage ../desktops/lxde/core/lxsession { };
lxtask = callPackage ../desktops/lxde/core/lxtask { };
lxde = recurseIntoAttrs (callPackage ../desktops/lxde { });
# Backwards compatibility aliases
inherit (lxde)
lxappearance
lxappearance-gtk2
lxmenu-data
lxpanel
lxrandr
lxsession
lxtask
;
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit pkgs;