From 64ba7b53f189e0cb268fe42eb8496bfb765aac2e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Aug 2016 15:09:41 -0500
Subject: [PATCH] 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 | 8 ++------
 pkgs/top-level/emacs-packages.nix    | 6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index cc3ea8990431..45931e6914ad 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -36,10 +36,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
 
 with lib; let inherit (self) emacs; in
 
-{
-  packagesFun ? [], # packages explicitly requested by the user
-  extraStart ? ""
-}:
+packagesFun: # packages explicitly requested by the user
 
 let
   explicitRequires =
@@ -56,7 +53,7 @@ stdenv.mkDerivation {
   # 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
@@ -99,7 +96,6 @@ stdenv.mkDerivation {
 (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.
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index ef616f37e0c0..d2e3d2b866f9 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -63,7 +63,7 @@ let
     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;
   };
 
@@ -71,9 +71,7 @@ let
 
   inherit emacs melpaBuild trivialBuild;
 
-  emacsWrapper = emacsWrapper self;
-
-  emacsWithPackages = packagesFun: emacsWrapper { inherit packagesFun; };
+  emacsWithPackages = emacsWithPackages self;
 
   ## START HERE