[nongnu] elpa/nix-mode 57ac40d53b 214/500: Merge pull request #45 from eqyiel/master

[ELPA Syncer]

branch: elpa/nix-mode
commit 57ac40d53b4f4fe0d61fcabb41f8f3992384048e
Merge: 5a8b334c75 81680dd7ac
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #45 from eqyiel/master
    
    nix-repl.el: make it work with newer nix repl command
---
 nix-repl.el | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nix-repl.el b/nix-repl.el
index ed2db6974e..e8962806cd 100644
--- a/nix-repl.el
+++ b/nix-repl.el
@@ -14,10 +14,14 @@
   "nix-repl customizations"
   :group 'nix)
 
-(defcustom nix-repl-executable "nix-repl"
+(defcustom nix-repl-executable "nix"
   "Location of nix-repl command."
   :type 'string)
 
+(defcustom nix-repl-executable-args '("repl")
+  "Arguments to provide to nix-repl."
+  :type 'list)
+
 (define-derived-mode nix-repl-mode comint-mode "Nix-REPL"
   "Interactive prompt for Nix."
   (setq-local comint-prompt-regexp nix-prompt-regexp)
@@ -47,7 +51,10 @@
 
 (defun nix--make-repl-in-buffer (buffer)
   "Make Nix Repl in BUFFER."
-  (make-comint-in-buffer "Nix-REPL" buffer nix-repl-executable))
+  (apply
+   'make-comint-in-buffer
+   (append `("Nix-REPL" ,buffer ,nix-repl-executable nil)
+           nix-repl-executable-args)))
 
 (defun nix-get-completions (proc prefix)
   "Get Nix completions from Nix-repl process PROC and based off of PREFIX."