mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-03-11 11:16:34 +01:00
Fix path relativity in package db
This commit is contained in:
parent
d944971a10
commit
c109bbaa2e
@ -94,29 +94,42 @@ packageTarget pb shakeDir name plan = do
|
|||||||
() <- cmd cwd env "cabal" "copy"
|
() <- cmd cwd env "cabal" "copy"
|
||||||
() <- cmd cwd env "cabal" "register"
|
() <- cmd cwd env "cabal" "register"
|
||||||
makeFile (targetForPackage shakeDir name)
|
makeFile (targetForPackage shakeDir name)
|
||||||
where cwd = Cwd pkgDir
|
where cwd =
|
||||||
defaultEnv pwd = [("HASKELL_PACKAGE_SANDBOX",pwd <//> targetForDb shakeDir pb)]
|
Cwd pkgDir
|
||||||
opts pwd = ["--package-db=clear"
|
defaultEnv pwd =
|
||||||
|
[ ( "HASKELL_PACKAGE_SANDBOX"
|
||||||
|
, pwd <//>
|
||||||
|
targetForDb shakeDir pb)]
|
||||||
|
opts pwd =
|
||||||
|
[ "--package-db=clear"
|
||||||
, "--package-db=global"
|
, "--package-db=global"
|
||||||
, "--libdir=" ++ pwd <//> pbLibDir pb
|
, "--libdir=" ++ pwd <//> pbLibDir pb
|
||||||
, "--bindir=" ++ pwd <//> pbBinDir pb
|
, "--bindir=" ++ pwd <//> pbBinDir pb
|
||||||
, "--datadir=" ++ pwd <//> pbDataDir pb
|
, "--datadir=" ++ pwd <//> pbDataDir pb
|
||||||
, "--docdir=" ++ pwd <//> pbDocDir pb
|
, "--docdir=" ++ pwd <//> pbDocDir pb
|
||||||
, "--flags=" ++ flags] ++
|
, "--flags=" ++ flags] ++
|
||||||
["--package-db=" ++ pwd <//> targetForDb shakeDir pb
|
["--package-db=" ++
|
||||||
|not (pbGlobalInstall pb)]
|
pwd <//>
|
||||||
|
targetForDb shakeDir pb | not (pbGlobalInstall pb)]
|
||||||
pkgDir =
|
pkgDir =
|
||||||
shakeDir <//> nameVer
|
shakeDir <//> nameVer
|
||||||
nameVer =
|
nameVer =
|
||||||
display name ++
|
display name ++
|
||||||
"-" ++
|
"-" ++
|
||||||
display (ppVersion plan)
|
display (ppVersion plan)
|
||||||
flags = unwords $ map go $ M.toList (pcFlagOverrides (ppConstraints plan))
|
flags =
|
||||||
|
unwords $
|
||||||
|
map go $
|
||||||
|
M.toList
|
||||||
|
(pcFlagOverrides
|
||||||
|
(ppConstraints plan))
|
||||||
where
|
where
|
||||||
go (name', isOn) = concat
|
go (name',isOn) =
|
||||||
[ if isOn then "" else "-"
|
concat
|
||||||
, T.unpack (unFlagName name')
|
[ if isOn
|
||||||
]
|
then ""
|
||||||
|
else "-"
|
||||||
|
, T.unpack (unFlagName name')]
|
||||||
|
|
||||||
-- | Get the target file for confirming that all packages have been
|
-- | Get the target file for confirming that all packages have been
|
||||||
-- pre-fetched.
|
-- pre-fetched.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user