diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 34b0ae86e4e..76c6cc58953 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,5 +1,7 @@ -{ callPackage, pkgs }: -{ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + #### CORE EFL efl = callPackage ./efl { }; @@ -13,4 +15,5 @@ evisum = callPackage ./evisum { }; rage = callPackage ./rage { }; terminology = callPackage ./terminology { }; -} + +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86c31194f84..a978d6810c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33314,9 +33314,7 @@ with pkgs; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); inherit (cinnamon) mint-x-icons mint-y-icons; - enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { - callPackage = newScope enlightenment; - }); + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });