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

Merge pull request #17806 from matthewbauer/emacs-wrapper

Browse source 
emacs: add versatile "emacsWrapper"
This commit is contained in:
Thomas Tuegel 2016-08-18 08:16:48 -05:00 committed by GitHub
parent 2ba494b728 6ceedaaee4
commit da68127737
2 changed files with 10 additions and 4 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,7 +36,10 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
with lib; let inherit (self) emacs; in
packagesFun: # packages explicitly requested by the user
{
packagesFun ? [], # packages explicitly requested by the user
extraStart ? ""
}:
let
explicitRequires =
@ -53,7 +56,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; }
{ inherit explicitRequires lndir emacs extraStart; }
''
mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp
@ -96,6 +99,7 @@ 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;
};
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
emacsWrapper = import ../build-support/emacs/wrapper.nix {
inherit lib lndir makeWrapper stdenv runCommand;
};
@ -71,7 +71,9 @@ let
inherit emacs melpaBuild trivialBuild;
emacsWithPackages = emacsWithPackages self;
emacsWrapper = emacsWrapper self;
emacsWithPackages = packagesFun: emacsWrapper { inherit packagesFun; };
## START HERE