Merge pull request #657 from jcpetruzza/stack-ide-bin-path

Make stack-ide receive a path where the correct ide-backend-server is installed
commercialhaskell · Jul 22, 2015 · 2af3d1b · 2af3d1b
2 parents ba5bc52 + 055d159
commit 2af3d1b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/Stack/Ide.hs b/src/Stack/Ide.hs
@@ -108,14 +108,19 @@ ide targets useropts = do
                     else return Nothing
     localdb <- packageDatabaseLocal
     depsdb <- packageDatabaseDeps
+    bindirs <- extraBinDirs `ap` return True {- include local bin -}
     let pkgopts = concat (map _2 pkgs)
         srcfiles = concatMap (map toFilePath . _3) pkgs
         pkgdbs =
             ["--package-db=" <> toFilePath depsdb <> ":" <> toFilePath localdb]
+        paths =
+            ["--ide-backend-tools-path=" <> intercalate ":" (map toFilePath bindirs)
+            ]
     exec
         "stack-ide"
         (["--local-work-dir=" ++ toFilePath pwd] ++
          map ("--ghc-option=" ++) (filter (not . badForGhci) useropts) <>
+         paths <>
          pkgopts <>
          pkgdbs)
         (encode (initialRequest srcfiles))