summary refs log tree commit diff stats
path: root/emacs
diff options
context:
space:
mode:
authorAlan Pearce2018-05-27 15:15:29 +0200
committerAlan Pearce2018-05-27 15:17:45 +0200
commitd0b359989fbd84beba5a0a84af899e6840dff580 (patch)
tree3bc1587d90e83ba847ef4fe23f8a3af4aba948ad /emacs
parent448c80b4caa62dc2a62ab82ca954ba2e989cd775 (diff)
downloadnixfiles-d0b359989fbd84beba5a0a84af899e6840dff580.tar.lz
nixfiles-d0b359989fbd84beba5a0a84af899e6840dff580.tar.zst
nixfiles-d0b359989fbd84beba5a0a84af899e6840dff580.zip
Emacs: Update flycheck nix wrapper
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/main.el12
1 files changed, 4 insertions, 8 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 59fcc457..73734ab8 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