Skip to content
Browse files

Make 'D.C.PackageEnvironment' compile again.

The compiler didn't complain when I tested on 'package-environment-file' branch
because Main.hs didn't depend on this module.
  • Loading branch information...
1 parent 5ced794 commit 2ac02448d39c5f220382dc112fe51ecf8208fd1c @23Skidoo 23Skidoo committed
Showing with 3 additions and 2 deletions.
  1. +3 −2 cabal-install/Distribution/Client/PackageEnvironment.hs
View
5 cabal-install/Distribution/Client/PackageEnvironment.hs
@@ -177,14 +177,15 @@ loadPackageEnvironment verbosity pkgEnvDir = do
where
addBasePkgEnv :: IO PackageEnvironment -> IO PackageEnvironment
addBasePkgEnv body = do
- let base = basePackageEnvironment pkgEnvDir
+ let base = basePackageEnvironment pkgEnvDir
+ baseConf = pkgEnvSavedConfig base
extra <- body
case pkgEnvInherit extra of
NoFlag ->
return $ base `mappend` extra
(Flag confPath) -> do
conf <- loadConfig verbosity (Flag confPath) (Flag False)
- let conf' = base `mappend` conf `mappend` (pkgEnvSavedConfig extra)
+ let conf' = baseConf `mappend` conf `mappend` (pkgEnvSavedConfig extra)
return $ extra { pkgEnvSavedConfig = conf' }
-- | Descriptions of all fields in the package environment file.

0 comments on commit 2ac0244

Please sign in to comment.
Something went wrong with that request. Please try again.