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