From 084688bb357d42e2459fdd381da2fea17ffc96ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Mon, 23 Jan 2017 01:17:22 +0100
Subject: [PATCH] Fix 'debug' command when ghc(-pkg) not on PATH

---
 GhcMod/Debug.hs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/GhcMod/Debug.hs b/GhcMod/Debug.hs
index eb2a4eb..9e53b41 100644
--- a/GhcMod/Debug.hs
+++ b/GhcMod/Debug.hs
@@ -6,6 +6,7 @@ import Control.Monad
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 import Data.Char
+import Data.Maybe
 import Data.Version
 import Data.List.Split
 import System.Directory
@@ -33,10 +34,17 @@ debugInfo = do
     Options {..} <- options
     Cradle {..} <- cradle
 
+    [ghcPath, ghcPkgPath] <- liftIO $
+        case cradleProject of
+          StackProject se ->
+              catMaybes <$> sequence [getStackGhcPath se, getStackGhcPkgPath se]
+          _ ->
+              return ["ghc", "ghc-pkg"]
+
     cabal <-
         case cradleProject of
-          CabalProject -> cabalDebug
-          StackProject {} -> (++) <$> stackPaths <*> cabalDebug
+          CabalProject -> cabalDebug ghcPkgPath
+          StackProject {} -> (++) <$> stackPaths <*> cabalDebug ghcPkgPath
           _ -> return []
 
     pkgOpts <- packageGhcOptions
@@ -44,7 +52,7 @@ debugInfo = do
     readProc <- gmReadProcess
 
     ghcVersion <- liftIO $
-        dropWhileEnd isSpace <$> readProc "ghc" ["--numeric-version"] ""
+        dropWhileEnd isSpace <$> readProc ghcPath ["--numeric-version"] ""
 
     return $ unlines $
       [ "Version:              ghc-mod-" ++ showVersion version
@@ -67,8 +75,8 @@ stackPaths = do
          , "Stack ghc-pkg executable:" ++ show ghcPkg
          ]
 
-cabalDebug :: IOish m => GhcModT m [String]
-cabalDebug = do
+cabalDebug :: IOish m => FilePath -> GhcModT m [String]
+cabalDebug ghcPkgPath = do
     Cradle {..} <- cradle
     mcs <- cabalResolvedComponents
     let entrypoints = Map.map gmcEntrypoints mcs
@@ -85,7 +93,7 @@ cabalDebug = do
             dropWhileEnd isSpace <$> readProc "cabal" ["--numeric-version"] ""
           else return ""
 
-    packages <- liftIO $ readProc "ghc-pkg" ["list", "--simple-output"] ""
+    packages <- liftIO $ readProc ghcPkgPath ["list", "--simple-output"] ""
     let cabalPackages = filter ((== ["Cabal"]) . take 1 . splitOn "-") $ splitWhen isSpace packages
 
     return $