From c109bbaa2e7787946722b93ac7a3726cbc553422 Mon Sep 17 00:00:00 2001 From: Chris Done Date: Tue, 13 Jan 2015 19:26:30 +0100 Subject: [PATCH] Fix path relativity in package db --- Stackage/ShakeBuild.hs | 47 +++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/Stackage/ShakeBuild.hs b/Stackage/ShakeBuild.hs index 67a3a9eb..d821b08f 100644 --- a/Stackage/ShakeBuild.hs +++ b/Stackage/ShakeBuild.hs @@ -94,29 +94,42 @@ packageTarget pb shakeDir name plan = do () <- cmd cwd env "cabal" "copy" () <- cmd cwd env "cabal" "register" makeFile (targetForPackage shakeDir name) - where cwd = Cwd pkgDir - defaultEnv pwd = [("HASKELL_PACKAGE_SANDBOX",pwd targetForDb shakeDir pb)] - opts pwd = ["--package-db=clear" - ,"--package-db=global" - ,"--libdir=" ++ pwd pbLibDir pb - ,"--bindir=" ++ pwd pbBinDir pb - ,"--datadir=" ++ pwd pbDataDir pb - ,"--docdir=" ++ pwd pbDocDir pb - ,"--flags=" ++ flags] ++ - ["--package-db=" ++ pwd targetForDb shakeDir pb - |not (pbGlobalInstall pb)] + where cwd = + Cwd pkgDir + defaultEnv pwd = + [ ( "HASKELL_PACKAGE_SANDBOX" + , pwd + targetForDb shakeDir pb)] + opts pwd = + [ "--package-db=clear" + , "--package-db=global" + , "--libdir=" ++ pwd pbLibDir pb + , "--bindir=" ++ pwd pbBinDir pb + , "--datadir=" ++ pwd pbDataDir pb + , "--docdir=" ++ pwd pbDocDir pb + , "--flags=" ++ flags] ++ + ["--package-db=" ++ + pwd + targetForDb shakeDir pb | not (pbGlobalInstall pb)] pkgDir = shakeDir nameVer nameVer = display name ++ "-" ++ display (ppVersion plan) - flags = unwords $ map go $ M.toList (pcFlagOverrides (ppConstraints plan)) - where - go (name', isOn) = concat - [ if isOn then "" else "-" - , T.unpack (unFlagName name') - ] + flags = + unwords $ + map go $ + M.toList + (pcFlagOverrides + (ppConstraints plan)) + where + go (name',isOn) = + concat + [ if isOn + then "" + else "-" + , T.unpack (unFlagName name')] -- | Get the target file for confirming that all packages have been -- pre-fetched.