Merge pull request #172000 from AndersonTorres/reorder-desktops

lxde: refactor
2022-05-07 21:37:43 -03:00
parent 69a57d5b2e d51fa87975
commit e37b68f51f
3 changed files with 36 additions and 18 deletions
@@ -0,0 +1,25 @@
+{ config, lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self: with self; {
+
+  inherit (pkgs) gtk2-x11;
+
+  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 { };
+})
@@ -32497,24 +32497,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;