From 681ed8c8324205d69ad2c083737f72409c3df162 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 26 Jun 2017 14:40:04 +0200
Subject: Emacs: use nix wrappers for flycheck iff sandbox detected

---
 emacs/.emacs.d/init.org | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index aa2ea28..3004689 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -428,9 +428,15 @@ and some convenience commands for building packages and launching shells.
   :config (progn
             (with-eval-after-load 'flycheck
               (setq flycheck-command-wrapper-function
-                    (lambda (command) (apply 'nix-shell-command (nix-current-sandbox) command))
+                    (lambda (command)
+                      (if (nix-current-sandbox)
+                          (apply 'nix-shell-command (nix-current-sandbox) command)
+                        command))
                     flycheck-executable-find
-                    (lambda (cmd) (nix-executable-find (nix-current-sandbox) cmd))))))
+                    (lambda (cmd)
+                      (if (nix-current-sandbox)
+                          (nix-executable-find (nix-current-sandbox) cmd)
+                        (executable-find cmd)))))))
 #+END_SRC
 
 * Keybindings
-- 
cgit 1.4.1