diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
| commit | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (patch) | |
| tree | 982675c7719f2060a550e80747dfa49c1a9d6b06 /pkgs/build-support | |
| parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) | |
| parent | 81760f32353fa7f309a49fda17d90f43ac1e9a42 (diff) | |
| download | nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.gz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.bz2 nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.lz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.xz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.zst nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index dfdd5b60851..b242672df10 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -18,10 +18,10 @@ the correct version of Emacs. `emacsWithPackages` inherits the package set which contains it, so the correct way to override the provided package set is to override the set which contains `emacsWithPackages`. For example, to override -`emacsPackagesNg.emacsWithPackages`, +`emacsPackages.emacsWithPackages`, ``` let customEmacsPackages = - emacsPackagesNg.overrideScope' (self: super: { + emacsPackages.overrideScope' (self: super: { # use a custom version of emacs emacs = ...; # use the unstable MELPA version of magit |