Browse files

fix to work with cabal 1.8

--HG--
extra : convert_revision : 893ed1b142ca84b2acb8c68a7c6c4f87a918486c
  • Loading branch information...
1 parent b61ed13 commit 6859d0260afaf8d687ba6a541218f88d6a35b8f0 @waterson waterson committed Mar 2, 2010
Showing with 3 additions and 5 deletions.
  1. +3 −5 Setup.lhs
View
8 Setup.lhs
@@ -23,21 +23,19 @@ main = defaultMainWithHooks simpleUserHooks {
return lbi {
localPkgDescr = updatePackageDescription
(Just bi, []) (localPkgDescr lbi)
- }
+ }
}
mysqlConfigProgram = (simpleProgram "mysql_config") {
programFindLocation = \verbosity -> do
- mysql_config <- findProgramOnPath "mysql_config" verbosity
+ mysql_config <- findProgramOnPath "mysql_config" verbosity
mysql_config5 <- findProgramOnPath "mysql_config5" verbosity
return (mysql_config `mplus` mysql_config5)
}
mysqlBuildInfo :: LocalBuildInfo -> IO BuildInfo
mysqlBuildInfo lbi = do
- (mysqlConfigProg, _) <- requireProgram verbosity
- mysqlConfigProgram AnyVersion (withPrograms lbi)
- let mysqlConfig = rawSystemProgramStdout verbosity mysqlConfigProg
+ let mysqlConfig = rawSystemProgramStdoutConf verbosity mysqlConfigProgram (withPrograms lbi)
ws = " \n\r\t"
includeDirs <- return . map (drop 2) . split ws =<< mysqlConfig ["--include"]

0 comments on commit 6859d02

Please sign in to comment.