[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit b4a8175f168d11cffda94c2f84441dd8ce4c5228
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Dec 1 00:15:33 2006 +0100

    Working configurator for Unix

diff --git a/Setup.hs b/Setup.hs
index 3f9a060..3ef9e87 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -5,18 +5,15 @@ import Distribution.PackageDescription
 import Distribution.Version
 import System.Info
 
-winHooks = defaultUserHooks {readDesc = customReadDesc}
-
-customReadDesc =
-    do pdesc <- readDesc defaultUserHooks
-       case pdesc of
-         Nothing -> return Nothing
-         Just d -> if System.Info.os == "mingw32"
-                      then return pdesc
-                      else return $ Just (d {buildDepends = 
-                                               (Dependency "unix" AnyVersion) :
-                                               buildDepends d})
+winHooks = defaultUserHooks {confHook = customConfHook}
 
+customConfHook descrip flags =
+    let mydescrip = case System.Info.os of
+                      "mingw32" -> descrip
+                      _ -> descrip {buildDepends = 
+                                        (Dependency "unix" AnyVersion) :
+                                        buildDepends descrip}
+    in (confHook defaultUserHooks) mydescrip flags
                                                           
 main = defaultMainWithHooks winHooks
 

-- 
haskell-testpack