From 5f41e8828a699b1b7ebe4e7d84826a86eac3bc5b Mon Sep 17 00:00:00 2001
From: Daniel Vigovszky <daniel.vigovszky@gmail.com>
Date: Tue, 19 May 2015 19:50:36 +0200
Subject: [PATCH] Revert "Not passing package db flags in default case"

This reverts commit 76e5af817af41a4903957fc3a768f0eb2f19ad55.
---
 Language/Haskell/GhcMod/CabalHelper.hs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Language/Haskell/GhcMod/CabalHelper.hs b/Language/Haskell/GhcMod/CabalHelper.hs
index 42bb744..1ea7a55 100644
--- a/Language/Haskell/GhcMod/CabalHelper.hs
+++ b/Language/Haskell/GhcMod/CabalHelper.hs
@@ -101,10 +101,7 @@ withCabal action = do
     opts <- options
     liftIO $ whenM (isSetupConfigOutOfDate <$> getCurrentWorld crdl) $
         withDirectory_ (cradleRootDir crdl) $ do
-            let pkgDbStack = cradlePkgDbStack crdl
-                pkgDbArgs = if pkgDbStack == defaultPkgDbStack
-                            then []
-                            else "--package-db=clear" : map pkgDbArg pkgDbStack
+            let pkgDbArgs = "--package-db=clear" : map pkgDbArg (cradlePkgDbStack crdl)
                 progOpts =
                     [ "--with-ghc=" ++ T.ghcProgram opts ]
                     -- Only pass ghc-pkg if it was actually set otherwise we
@@ -121,6 +118,3 @@ pkgDbArg :: GhcPkgDb -> String
 pkgDbArg GlobalDb      = "--package-db=global"
 pkgDbArg UserDb        = "--package-db=user"
 pkgDbArg (PackageDb p) = "--package-db=" ++ p
-
-defaultPkgDbStack :: [GhcPkgDb]
-defaultPkgDbStack = [GlobalDb, UserDb]