haskell/ghcide
1
1
Fork 0
mirror of https://github.com/haskell/ghcide.git synced 2024-12-17 23:22:04 +03:00
Code Issues Projects Releases Wiki Activity

compiler: follow ghc convention and put conf files in package.conf.d dir (#978)

Browse Source 
* compiler: follow ghc convention and put conf files in package.conf.d dir

We follow the ghc convention and locate all .conf files for the package
database in the `package.conf.d` dir.

* addressed neil's comment
This commit is contained in:
Robin Krom 2019-05-08 14:23:04 +02:00 committed by GitHub
parent 56d7dac830
commit 73b9de2536
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Development/IDE/UtilGHC.hs
View File

@ -29,6 +29,7 @@ import qualified Packages
import Platform import Platform
import qualified EnumSet import qualified EnumSet
import Data.IORef import Data.IORef
import System.FilePath
import GHC.Generics (Generic) import GHC.Generics (Generic)
---------------------------------------------------------------------- ----------------------------------------------------------------------
@ -38,7 +39,7 @@ setPackageDbs :: [FilePath] -> DynFlags -> DynFlags
setPackageDbs paths dflags = setPackageDbs paths dflags =
dflags dflags
{ packageDBFlags = { packageDBFlags =
[PackageDB $ PkgConfFile path | path <- paths] ++ [NoGlobalPackageDB, ClearPackageDBs] [PackageDB $ PkgConfFile $ path </> "package.conf.d" | path <- paths] ++ [NoGlobalPackageDB, ClearPackageDBs]
, pkgDatabase = if null paths then Just [] else Nothing , pkgDatabase = if null paths then Just [] else Nothing
-- if we don't load any packages set the package database to empty and loaded. -- if we don't load any packages set the package database to empty and loaded.
, settings = (settings dflags) , settings = (settings dflags)