From 3db768d6bd5e720c9e1186415dbc36d8cd8caade Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Thu, 12 Mar 2015 13:58:45 +0100
Subject: Use `-package-conf` to be backwards compatible

---
 CabalHelper/Wrapper.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'CabalHelper/Wrapper.hs')

diff --git a/CabalHelper/Wrapper.hs b/CabalHelper/Wrapper.hs
index 6ba933d..933cb2f 100644
--- a/CabalHelper/Wrapper.hs
+++ b/CabalHelper/Wrapper.hs
@@ -236,7 +236,7 @@ compile Options {..} Compile {..} = do
           , "-optP-DCABAL_MAJOR=" ++ show mj
           , "-optP-DCABAL_MINOR=" ++ show mi
           ],
-          maybeToList $ ("-package-db="++) <$> packageDb,
+          maybeToList $ ("-package-conf="++) <$> packageDb,
           map ("-i"++) $ cabalHelperSourceDir:maybeToList cabalSourceDir,
           concatMap (\p -> ["-package", p]) packageDeps,
           [ "--make",  cabalHelperSourceDir </> "CabalHelper/Main.hs" ]
@@ -353,7 +353,7 @@ listCabalVersions opts = listCabalVersions' opts Nothing
 -- TODO: Include sandbox? Probably only relevant for build-type:custom projects.
 listCabalVersions' :: Options -> Maybe FilePath -> IO [Version]
 listCabalVersions' Options {..} mdb = do
-  let mdbopt = ("--package-db="++) <$> mdb
+  let mdbopt = ("--package-conf="++) <$> mdb
       opts = ["list", "--simple-output", "Cabal"] ++ maybeToList mdbopt
 
   catMaybes . map (fmap snd . parsePkgId . fromString) . words
-- 
cgit v1.2.3