diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-19 15:09:41 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-19 15:09:41 -0500 |
| commit | 64ba7b53f189e0cb268fe42eb8496bfb765aac2e (patch) | |
| tree | bed7896afacf2175ac68aea42f31301f54e7c418 /pkgs/build-support/emacs | |
| parent | 4574f22841d23a12fc135af74f198c4313002f4a (diff) | |
| download | nixpkgs-64ba7b53f189e0cb268fe42eb8496bfb765aac2e.tar nixpkgs-64ba7b53f189e0cb268fe42eb8496bfb765aac2e.tar.gz nixpkgs-64ba7b53f189e0cb268fe42eb8496bfb765aac2e.tar.bz2 nixpkgs-64ba7b53f189e0cb268fe42eb8496bfb765aac2e.tar.lz nixpkgs-64ba7b53f189e0cb268fe42eb8496bfb765aac2e.tar.xz nixpkgs-64ba7b53f189e0cb268fe42eb8496bfb765aac2e.tar.zst nixpkgs-64ba7b53f189e0cb268fe42eb8496bfb765aac2e.zip | |
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.
Diffstat (limited to 'pkgs/build-support/emacs')
| -rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index cc3ea899043..45931e6914a 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. |