ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues 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
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 with lib; let inherit (self) emacs; in
packagesFun: # packages explicitly requested by the user {
packagesFun ? [], # packages explicitly requested by the user
extraStart ? ""
}:
let let
explicitRequires = explicitRequires =
@ -53,7 +56,7 @@ stdenv.mkDerivation {
# Store all paths we want to add to emacs here, so that we only need to add # Store all paths we want to add to emacs here, so that we only need to add
# one path to the load lists # one path to the load lists
deps = runCommand "emacs-packages-deps" deps = runCommand "emacs-packages-deps"
{ inherit explicitRequires lndir emacs; } { inherit explicitRequires lndir emacs extraStart; }
'' ''
mkdir -p $out/bin mkdir -p $out/bin
mkdir -p $out/share/emacs/site-lisp mkdir -p $out/share/emacs/site-lisp
@ -96,6 +99,7 @@ stdenv.mkDerivation {
(load-file "$emacs/share/emacs/site-lisp/site-start.el") (load-file "$emacs/share/emacs/site-lisp/site-start.el")
(add-to-list 'load-path "$out/share/emacs/site-lisp") (add-to-list 'load-path "$out/share/emacs/site-lisp")
(add-to-list 'exec-path "$out/bin") (add-to-list 'exec-path "$out/bin")
$extraStart
EOF EOF
# Byte-compiling improves start-up time only slightly, but costs nothing. # 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; 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; inherit lib lndir makeWrapper stdenv runCommand;
}; };
@ -71,7 +71,9 @@ let
inherit emacs melpaBuild trivialBuild; inherit emacs melpaBuild trivialBuild;
emacsWithPackages = emacsWithPackages self; emacsWrapper = emacsWrapper self;
emacsWithPackages = packagesFun: emacsWrapper { inherit packagesFun; };
## START HERE ## START HERE