From bfdf0f4afb759fecbc6d374dadf1b522f70f9e54 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 1 Sep 2017 20:37:00 +0200
Subject: Emacs: Fix daemon startup error

---
 emacs/.emacs.d/main.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index eb8259e..1b4bff3 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -60,8 +60,11 @@
 ;; #+BEGIN_SRC emacs-lisp
 (eval-and-compile
   (require 'seq)
-  (defvar nix-emacs (and (string-match "^/nix/store" invocation-directory)
-                         (not (null (seq-some (lambda (dir) (string-match "^/nix/store" dir)) load-path)))))
+  (defun is-nix-emacs ()
+    (and invocation-directory
+         (string-match "^/nix/store" invocation-directory)
+         (not (null (seq-some (lambda (dir) (string-match "^/nix/store" dir)) load-path)))))
+  (defvar nix-emacs (is-nix-emacs))
 
   (setq tls-checktrust t
         gnutls-verify-error t
-- 
cgit 1.4.1