Fix doc command not using right ghc-pkg exe

This commit is contained in:
Daniel Gröber
2015-09-02 07:19:11 +02:00
parent 86c157d1d2
commit 8fea4ac426
2 changed files with 18 additions and 3 deletions

View File

@@ -6,6 +6,7 @@ module Language.Haskell.GhcMod.GhcPkg (
, ghcDbOpt
, getPackageDbStack
, getPackageCachePaths
, getGhcPkgProgram
) where
import Config (cProjectVersion, cTargetPlatformString, cProjectVersionInt)
@@ -59,6 +60,18 @@ ghcDbOpt (PackageDb pkgDb)
----------------------------------------------------------------
getGhcPkgProgram :: IOish m => GhcModT m FilePath
getGhcPkgProgram = do
crdl <- cradle
progs <- optPrograms <$> options
case cradleProjectType crdl of
StackProject -> do
Just ghcPkg <- getStackGhcPkgPath (cradleRootDir crdl)
return ghcPkg
_ ->
return $ ghcPkgProgram progs
getPackageDbStack :: IOish m => GhcModT m [GhcPkgDb]
getPackageDbStack = do
crdl <- cradle