From 7fe7afcc49994e5f9b6abd5455b27a1473eef8d4 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Thu, 6 Aug 2015 04:38:52 +0200
Subject: package-db stack is global not per component

---
 CabalHelper/Main.hs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'CabalHelper')

diff --git a/CabalHelper/Main.hs b/CabalHelper/Main.hs
index 35af775..077eaab 100644
--- a/CabalHelper/Main.hs
+++ b/CabalHelper/Main.hs
@@ -229,11 +229,8 @@ main = do
           pkgDbStr UserPackageDB   = "U"
           pkgDbStr (SpecificPackageDB s) = "S" ++ s
 
-      res <- map (\(c, opts) -> (c, map pkgDbStr $ ghcOptPackageDBs opts))
-         <$> componentOptions' lvd False [] (\_ _ x -> return x) id
-
       -- TODO: Setup.hs has access to the sandbox as well: ghc-mod#478
-      return $ Just $ ChResponseCompList $ (res :: [(ChComponentName, [String])]) ++ [(ChSetupHsName, [])]
+      return $ Just $ ChResponseList $ map pkgDbStr $ withPackageDB lbi
 
     "entrypoints":[] -> do
       eps <- componentsMap lbi v distdir $ \c clbi bi ->
-- 
cgit v1.2.3