From d0b359989fbd84beba5a0a84af899e6840dff580 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sun, 27 May 2018 15:15:29 +0200
Subject: Emacs: Update flycheck nix wrapper

---
 emacs/.emacs.d/main.el | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 59fcc45..73734ab 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -340,15 +340,11 @@
   :config (progn
             (with-eval-after-load 'flycheck
               (setq flycheck-command-wrapper-function
-                    (lambda (command)
-                      (if (nix-current-sandbox)
-                          (apply 'nix-shell-command (nix-current-sandbox) command)
-                        command))
-                    flycheck-executable-find
                     (lambda (cmd)
-                      (if (nix-current-sandbox)
-                          (nix-executable-find (nix-current-sandbox) cmd)
-                        (executable-find cmd)))))))
+                      (apply 'nix-shell-command (nix-current-sandbox)
+                             (list (mapconcat 'shell-quote-argument cmd " "))))
+                    flycheck-executable-find
+                    (lambda (cmd) (nix-executable-find (nix-current-sandbox) cmd))))))
 
 ;;;; Keybindings
 
-- 
cgit 1.4.1