all repos — nixfiles @ efa975ed49a33accf3d8c0d674320f26c9ec1cca

System and user configuration, managed by nix and home-manager

Emacs: Fix building emacs config files on macOS

Alan Pearce
commit

efa975ed49a33accf3d8c0d674320f26c9ec1cca

parent

91ddb83cbe0dfe03e9d2d3ea3984fc824407e5f9

2 files changed, 6 insertions(+), 2 deletions(-)

jump to
M emacs/.emacs.d/Makefileemacs/.emacs.d/Makefile
@@ -1,5 +1,6 @@
define EMACS_TANGLE (progn\ + (require 'package)\ (package-refresh-contents nil)\ (setq vc-follow-symlinks nil)\ (find-file \"init.org\")\
@@ -7,6 +8,8 @@ (require 'ob-tangle)\
(org-babel-tangle nil \"init.el\")) endef +EMACS := ${NIX_LINK}/bin/emacs + # The first target is the default. `all` is typically defined here. all: init.elc
@@ -14,10 +17,10 @@ # These targets don't pertain to files
.PHONY: all clean init.el: - @emacs --batch --no-init-file --eval "$(EMACS_TANGLE)" --kill + $(EMACS) --batch --no-init-file --eval "$(EMACS_TANGLE)" --kill init.elc: init.el - @emacs --batch --no-init-file --funcall batch-byte-compile init.el + $(EMACS) --batch --no-init-file --funcall batch-byte-compile init.el clean: rm init.el init.elc
M zsh/.config/zsh/.zshenvzsh/.config/zsh/.zshenv
@@ -18,6 +18,7 @@
if [[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] then . $HOME/.nix-profile/etc/profile.d/nix.sh; + export NIX_LINK fi case $OSTYPE in