diff options
author | William Carroll <wpcarro@gmail.com> | 2020-08-27T17·25+0100 |
---|---|---|
committer | William Carroll <wpcarro@gmail.com> | 2020-08-27T17·25+0100 |
commit | d67dbec7e82b7c907d7c1c4fa92ae922abeca059 (patch) | |
tree | 847bb9d392b2e4e40ce71d8641734cde9c7501f2 | |
parent | a1a2f0bbbdcfcae90db71f0851b05b031e46ced7 (diff) |
Clean up emacs/default.nix
- Prefer prepending wpcDir, vendorDir to EMACSLOADPATH instead of using the --directory flag - Remove --load ${wpcPackageEl} because init.el calls (require 'wpc-package) - Surround $@ in 2x-quotes
-rw-r--r-- | emacs/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/emacs/default.nix b/emacs/default.nix index f7f7463e56b3..e8d52c34cc9d 100644 --- a/emacs/default.nix +++ b/emacs/default.nix @@ -138,17 +138,14 @@ let export XMODIFIERS=emacs export BRIEFCASE=$HOME/briefcase export PATH="${emacsBinPath}:$PATH" - export EMACSLOADPATH="${wpcarrosEmacs.deps}/share/emacs/site-lisp:" + export EMACSLOADPATH="${wpcDir}:${vendorDir}:${wpcarrosEmacs.deps}/share/emacs/site-lisp:" exec ${emacsBin} \ --debug-init \ --no-site-file \ --no-site-lisp \ - --directory ${vendorDir} \ - --directory ${wpcDir} \ - --load ${wpcPackageEl} \ --load ${initEl} \ --no-init-file \ - $@ + "$@" ''; in { # Use `nix-env -f '<briefcase>' emacs.glinux` to install `wpcarro-emacs` on |