[commit: ghc] master: Follow changes in Cabal (0440d8a)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0440d8af7837f905734368c239f11ae3b442ec0b

>---------------------------------------------------------------

commit 0440d8af7837f905734368c239f11ae3b442ec0b
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Aug 23 15:20:33 2012 +0100

    Follow changes in Cabal

>---------------------------------------------------------------

 utils/ghc-cabal/Main.hs         |    3 ++-
 utils/ghc-cabal/ghc-cabal.cabal |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 0f11eea..3e43800 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -20,6 +20,7 @@ import qualified Distribution.InstalledPackageInfo as Installed
 import qualified Distribution.Simple.PackageIndex as PackageIndex
 
 import Control.Monad
+import qualified Data.ByteString.Lazy.Char8 as BS
 import Data.List
 import Data.Maybe
 import System.IO
@@ -284,7 +285,7 @@ generate config_args distdir directory
                                   Installed.haddockHTMLs = []
                               }
                   content = Installed.showInstalledPackageInfo final_ipi ++ "\n"
-              writeFileAtomic (distdir </> "inplace-pkg-config") (toUTF8 content)
+              writeFileAtomic (distdir </> "inplace-pkg-config") (BS.pack $ toUTF8 content)
           _ -> error "Inconsistent lib components; can't happen?"
 
       let
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index ce15310..cc6fbee 100644
--- a/utils/ghc-cabal/ghc-cabal.cabal
+++ b/utils/ghc-cabal/ghc-cabal.cabal
@@ -16,6 +16,7 @@ Executable ghc-cabal
     Main-Is: ghc-cabal.hs
 
     Build-Depends: base       >= 3   && < 5,
+                   bytestring >= 0.10 && < 0.11,
                    Cabal      >= 1.10 && < 1.18,
                    directory  >= 1.1 && < 1.2,
                    filepath   >= 1.2 && < 1.4