b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
This reverts commit da68127737, reversing
changes made to 2ba494b728.

These changes are reverted because they cause an incompatibility which
they should not.
This commit is contained in:
Thomas Tuegel 2016-08-19 15:09:41 -05:00
parent 4574f22841
commit 64ba7b53f1
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/build-support/emacs/wrapper.nix
View file

@ -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.

6
pkgs/top-level/emacs-packages.nix
View file

@ -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