Refactor nix-shell-ghci support.

Author: alexanderkjeldaas

haskell-process.el

@@ -1075,23 +1075,21 @@ now."
                            "-s"
                            dir)))
          ('nix-shell-ghci
-          (haskell-process-log
-           (propertize
-            (format "Starting inferior nix-shell (ghci) process using %s %s %s %s..."
-                    haskell-process-path-nix-shell
-                    haskell-process-args-nix-shell
-                    "--command"
-                    haskell-process-path-ghci)
-            'face font-lock-comment-face))
-          (apply #'start-process
-                 (append (list (haskell-session-name session)
-                               nil
-                               haskell-process-path-nix-shell)
-                         haskell-process-args-nix-shell
-                         '("--command")
-                         (list haskell-process-path-ghci)
-                         (let ((target (haskell-session-target session)))
-                           (if target (list target) nil))))))))
+          (let ((args (append (list haskell-process-path-nix-shell)
+                              haskell-process-args-nix-shell
+                              '("--command")
+                              (list haskell-process-path-ghci)
+                              (let ((target (haskell-session-target session)))
+                                (if target (list target) nil)))))
+           (haskell-process-log
+            (propertize
+             (format "Starting inferior nix-shell (ghci) process using %s..."
+                     (mapconcat 'identity args " "))
+             'face font-lock-comment-face))
+           (apply #'start-process
+                  (append (list (haskell-session-name session)
+                                nil)
+                          args)))))))
     (progn (set-process-sentinel (haskell-process-process process) 'haskell-process-sentinel)
            (set-process-filter (haskell-process-process process) 'haskell-process-filter))
     (haskell-process-send-startup process)