diff options
| author | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-05-07 18:51:49 -0300 |
|---|---|---|
| committer | AndersonTorres <torres.anderson.85@protonmail.com> | 2022-05-07 19:05:38 -0300 |
| commit | c268cb0725f0cef8539419bc20dc956fb9ce4a30 (patch) | |
| tree | e1b42ce23b665b1d0434c6974bc5b6436dace7fd /pkgs | |
| parent | f8a27ed69a07ca360dabf3e9d89146663c2027aa (diff) | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/lxde/core/lxmenu-data/default.nix (renamed from pkgs/desktops/lxde/core/lxmenu-data.nix) | 0 | ||||
| -rw-r--r-- | pkgs/desktops/lxde/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 29 |
3 files changed, 34 insertions, 18 deletions
diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix index e52445aa0b049..e52445aa0b049 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data/default.nix diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix new file mode 100644 index 0000000000000..702b4bbb67d5a --- /dev/null +++ b/pkgs/desktops/lxde/default.nix @@ -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 { }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8a7e821ba927..96f3e4a07227c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |