Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
81a752bc
Commit
81a752bc
authored
Sep 08, 2013
by
Mikhail Glushenkov
Browse files
Initialise 'configInstallDirs' properly when loading sandbox config.
Fixes #1482.
parent
3b990b1c
Changes
1
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs
View file @
81a752bc
...
...
@@ -322,12 +322,25 @@ tryLoadSandboxPackageEnvironmentFile verbosity pkgEnvFile configFileFlag = do
-- Layer the package environment settings over settings from ~/.cabal/config.
cabalConfig
<-
loadConfig
verbosity
configFileFlag
NoFlag
return
(
sandboxDir
,
updateInstallDirs
$
(
base
`
mappend
`
(
toPkgEnv
cabalConfig
)
`
mappend
`
common
`
mappend
`
inherited
`
mappend
`
user
)
`
overrideSandboxSettings
`
pkgEnv
)
where
toPkgEnv
config
=
mempty
{
pkgEnvSavedConfig
=
config
}
updateInstallDirs
pkgEnv
=
let
config
=
pkgEnvSavedConfig
pkgEnv
configureFlags
=
savedConfigureFlags
config
installDirs
=
savedUserInstallDirs
config
in
pkgEnv
{
pkgEnvSavedConfig
=
config
{
savedConfigureFlags
=
configureFlags
{
configInstallDirs
=
installDirs
}
}
}
-- | Should the generated package environment file include comments?
data
IncludeComments
=
IncludeComments
|
NoComments
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment