enlightenment: make new scope

2 files changed, 7 insertions, 6 deletions

diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index 34b0ae86e4e27..76c6cc58953aa 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 3d9a2ab1bec3a..ad18a03862767 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33191,9 +33191,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 { });