X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackageConfig.hs;h=50c1e7105aeea53f25f0044271e49a375fc13b57;hb=777b8c4bd6f8a76f2fd365aa43451b7af098e9ef;hp=79521c7df7cdc3f7f12d46f179b007418230b135;hpb=72547264724117d689a7fa400104185557fb2a0c;p=ghc-hetmet.git

diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs
index 79521c7..50c1e71 100644
--- a/compiler/main/PackageConfig.hs
+++ b/compiler/main/PackageConfig.hs
@@ -59,7 +59,7 @@ mkPackageId = stringToPackageId . display
 
 -- | Get the GHC 'PackageId' right out of a Cabalish 'PackageConfig'
 packageConfigId :: PackageConfig -> PackageId
-packageConfigId = mkPackageId . package
+packageConfigId = mkPackageId . sourcePackageId
 
 -- | Turn a 'PackageConfig', which contains GHC 'Module.ModuleName's into a Cabal specific
 -- 'InstalledPackageInfo' which contains Cabal 'Distribution.ModuleName.ModuleName's
@@ -74,11 +74,9 @@ packageConfigToInstalledPackageInfo
 
 -- | Turn an 'InstalledPackageInfo', which contains Cabal 'Distribution.ModuleName.ModuleName's
 -- into a GHC specific 'PackageConfig' which contains GHC 'Module.ModuleName's
-installedPackageInfoToPackageConfig :: InstalledPackageInfo -> PackageConfig
+installedPackageInfoToPackageConfig :: InstalledPackageInfo_ String -> PackageConfig
 installedPackageInfoToPackageConfig
     (pkgconf@(InstalledPackageInfo { exposedModules = e,
                                      hiddenModules = h })) =
-        pkgconf{ exposedModules = map convert e,
-                 hiddenModules  = map convert h }
-    where convert :: Distribution.ModuleName.ModuleName -> Module.ModuleName
-          convert = mkModuleName . display
+        pkgconf{ exposedModules = map mkModuleName e,
+                 hiddenModules  = map mkModuleName h }