Use overrideScope' for override

This fixes an issue that override cannot override packages which are
the dependencies of usePkgs and not in usePkgs.

This also preserves backward compatibility of override.  The hash of
the generated Emacs package from emacsWithPackagesFromUsePackage does
not change after this patch is applied using the old style override.
This commit is contained in:
Lin Jian 2023-04-11 01:41:55 +08:00
parent 96fec8e6cd
commit d16c6c1fb2
No known key found for this signature in database
GPG key ID: A6698D36434F75A5
3 changed files with 21 additions and 13 deletions

View file

@ -126,8 +126,8 @@ required in a user's config via =use-package= or =leaf=.
];
# Optionally override derivations.
override = epkgs: epkgs // {
weechat = epkgs.melpaPackages.weechat.overrideAttrs(old: {
override = final: prev: {
weechat = prev.melpaPackages.weechat.overrideAttrs(old: {
patches = [ ./weechat-el.patch ];
});
};