emacsWithPackages: know its own package set

Fixes #10819. emacsWithPackages will know its own package set. This
requires it to be in a package set, rather than at the top level, so it
lives in emacsPackagesNg.

1 files changed, 10 insertions, 3 deletions

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index 4020a1aca33..8de13dc0c64 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -1,8 +1,15 @@
-{ stdenv, makeWrapper, emacs }:
+{ lib, makeWrapper, stdenv }: self:
 
-with stdenv.lib;
+with lib; let inherit (self) emacs; in
 
-explicitRequires: # packages explicitly requested by the user
+packagesFun: # packages explicitly requested by the user
+
+let
+  explicitRequires =
+    if builtins.isFunction packagesFun
+      then packagesFun self
+    else packagesFun;
+in
 
 stdenv.mkDerivation {
   name = (appendToName "with-packages" emacs).name;