enlightenment: make new scope

pkgs/desktops/enlightenment/default.nix

···
-{ callPackage, pkgs }:
-{
+{ lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self: with self; {
+
   #### CORE EFL
   efl = callPackage ./efl { };
 
···
   evisum = callPackage ./evisum { };
   rage = callPackage ./rage { };
   terminology = callPackage ./terminology { };
-}
+
+})

pkgs/top-level/all-packages.nix

···
   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 { });