From f3b4da7a0e2cd137df565982a136528ca519dfc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Sun, 12 Apr 2015 02:39:55 +0200 Subject: [PATCH] Use cabal-helper to get `buildPlatform` --- Language/Haskell/GhcMod/PathsAndFiles.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Language/Haskell/GhcMod/PathsAndFiles.hs b/Language/Haskell/GhcMod/PathsAndFiles.hs index b1dcda3..14c04bc 100644 --- a/Language/Haskell/GhcMod/PathsAndFiles.hs +++ b/Language/Haskell/GhcMod/PathsAndFiles.hs @@ -26,13 +26,13 @@ import Data.List import Data.Char import Data.Maybe import Data.Traversable (traverse) +import Distribution.Helper (buildPlatform) import System.Directory import System.FilePath import System.IO.Unsafe import Language.Haskell.GhcMod.Types import Language.Haskell.GhcMod.Error -import Language.Haskell.GhcMod.Utils hiding (dropWhileEnd) import Language.Haskell.GhcMod.Caching import qualified Language.Haskell.GhcMod.Utils as U @@ -185,8 +185,7 @@ ghcSandboxPkgDbDir = cabalBuildPlatform ++ "-ghc-" ++ cProjectVersion ++ "-packages.conf.d" cabalBuildPlatform :: String -cabalBuildPlatform = dropWhileEnd isSpace $ unsafePerformIO $ - readLibExecProcess' "cabal-helper-wrapper" ["print-build-platform"] +cabalBuildPlatform = unsafePerformIO $ buildPlatform packageCache :: String packageCache = "package.cache"