diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ebd6464de5a1..cb6da618768c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -46,12 +46,7 @@ with lib.licenses; let - addMelpaPackages = scope: scope.override (super: melpaPackages); - addMelpaStablePackages = scope: scope.override (super: melpaStablePackages); - addElpaPackages = scope: scope.override (super: elpaPackages); - addOverrides = scope: scope.override packagesFun; - - packagesFun = super: self: with self; { + packagesFun = self: with self; { inherit emacs melpaBuild trivialBuild; @@ -2029,8 +2024,10 @@ let }; in - addOverrides - (addElpaPackages - (addMelpaStablePackages - (addMelpaPackages - (lib.makeScope newScope (self: { inherit emacs; }))))) + lib.makeScope newScope (self: + {} + // melpaPackages self + // melpaStablePackages self + // elpaPackages self + // packagesFun self + )