Commit ff16b7b7 authored by Duncan Coutts's avatar Duncan Coutts
Browse files

construct InstalledPackageInfo from scratch rather than by overriding

It means we catch any fields that get added. As it happens we were
missing a field, though its value is supposed to be just [] which is
the same value as we got from the default emptyInstalledPackageInfo.
parent 1464a836
......@@ -66,8 +66,8 @@ import Distribution.PackageDescription (PackageDescription(..),
import Distribution.Package
( Package(..), packageName )
import Distribution.InstalledPackageInfo
(InstalledPackageInfo, showInstalledPackageInfo,
emptyInstalledPackageInfo)
( InstalledPackageInfo, InstalledPackageInfo_(InstalledPackageInfo)
, showInstalledPackageInfo )
import qualified Distribution.InstalledPackageInfo as IPI
import Distribution.Simple.Utils
( createDirectoryIfMissingVerbose, copyFileVerbose, writeFileAtomic
......@@ -244,7 +244,7 @@ mkInstalledPackageInfo distPref pkg_descr lbi inplace = do
| inplace = build_dir
| otherwise = libdir installDirs
in
return emptyInstalledPackageInfo{
return InstalledPackageInfo {
IPI.package = packageId pkg_descr,
IPI.license = license pkg_descr,
IPI.copyright = copyright pkg_descr,
......@@ -262,6 +262,7 @@ mkInstalledPackageInfo distPref pkg_descr lbi inplace = do
IPI.libraryDirs = libraryDir : extraLibDirs bi,
IPI.hsLibraries = ["HS" ++ display (packageId pkg_descr)],
IPI.extraLibraries = extraLibs bi,
IPI.extraGHCiLibraries= [],
IPI.includeDirs = absinc ++ if inplace
then map (pwd </>) relinc
else installIncludeDir,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment