From 64984c5acb71c108c5de3b0f571cdb0f7eea4da3 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Wed, 13 Nov 2024 23:28:05 -0500 Subject: [PATCH] emacs: get packages from local emacs --- modules/programs/emacs.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index d63721494..3bc012f35 100644 --- a/modules/programs/emacs.nix +++ b/modules/programs/emacs.nix @@ -6,12 +6,9 @@ let cfg = config.programs.emacs; - # Copied from all-packages.nix, with modifications to support - # overrides. - emacsPackages = let epkgs = pkgs.emacsPackagesFor cfg.package; - in epkgs.overrideScope cfg.overrides; - - emacsWithPackages = emacsPackages.emacsWithPackages; + # Get the packages from the supplied emacs rather than the nixpkgs to ensure a + # separate emacs pin also carries with it the packages from that pin. + inherit (cfg.package.pkgs.overrideScope cfg.overrides) emacsWithPackages; extraPackages = epkgs: let