From e772ac45e327eb1f36e0e46e474551f82cbc37ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 22 Jul 2022 10:45:55 -0300 Subject: [PATCH] enlightenment: make new scope --- pkgs/desktops/enlightenment/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 6 deletions(-) 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 3d9a2ab1bec..ad18a038627 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 { });