Revert "Merge pull request #17806 from matthewbauer/emacs-wrapper"

This reverts commit da681277373320321a4e60f3491915b16f0b9f80, reversing
changes made to 2ba494b728ef9ba46e525132457a45a2384cf40e.

These changes are reverted because they cause an incompatibility which
they should not.

pkgs/build-support/emacs/wrapper.nix

···
 
 with lib; let inherit (self) emacs; in
 
-{
-  packagesFun ? [], # packages explicitly requested by the user
-  extraStart ? ""
-}:
+packagesFun: # packages explicitly requested by the user
 
 let
   explicitRequires =
···
   # Store all paths we want to add to emacs here, so that we only need to add
   # one path to the load lists
   deps = runCommand "emacs-packages-deps"
-   { inherit explicitRequires lndir emacs extraStart; }
+   { inherit explicitRequires lndir emacs; }
    ''
      mkdir -p $out/bin
      mkdir -p $out/share/emacs/site-lisp
···
 (load-file "$emacs/share/emacs/site-lisp/site-start.el")
 (add-to-list 'load-path "$out/share/emacs/site-lisp")
 (add-to-list 'exec-path "$out/bin")
-$extraStart
 EOF
 
      # Byte-compiling improves start-up time only slightly, but costs nothing.

pkgs/top-level/emacs-packages.nix

···
     inherit fetchurl lib stdenv texinfo;
   };
 
-  emacsWrapper = import ../build-support/emacs/wrapper.nix {
+  emacsWithPackages = import ../build-support/emacs/wrapper.nix {
     inherit lib lndir makeWrapper stdenv runCommand;
   };
 
···
 
   inherit emacs melpaBuild trivialBuild;
 
-  emacsWrapper = emacsWrapper self;
-
-  emacsWithPackages = packagesFun: emacsWrapper { inherit packagesFun; };
+  emacsWithPackages = emacsWithPackages self;
 
   ## START HERE