1c8616f · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

on master help sign in

Add cpphs build tool to "thyme" to fix the build on Darwin.

1c8616fPeter Simons11 years ago

src/Cabal2Nix/PostProcess.hs+1−1

@@ -36,6 +36,7 @@ hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ sh

36 , ("pango", set (libraryDepends . haskell . contains (dep "cairo")) True)

37 , ("readline", over (libraryDepends . system) (Set.union (Set.fromList [dep "readline", dep "ncurses"])))

38 , ("terminfo", set (libraryDepends . system . contains (dep "ncurses")) True)

39+ , ("thyme", set (libraryDepends . tool . contains (dep "cpphs")) True) -- required on Darwin

39 , ("monad", set phaseOverrides xmonadPostInstall)

40 , ("monad", set phaseOverrides xmonadPostInstall)

40 , ("wxc", wxcHook)

41 , ("wxc", wxcHook)

41 , ("wxcore", set (libraryDepends . pkgconfig . contains (dep "wxGTK")) True)

42 , ("wxcore", set (libraryDepends . pkgconfig . contains (dep "wxGTK")) True)

@@ -184,7 +185,6 @@ postProcess' deriv@(MkDerivation {..})

184 }

185 }

185 | pname == "target" = deriv { buildTools = Set.insert "z3" buildTools }

186 | pname == "target" = deriv { buildTools = Set.insert "z3" buildTools }

186 | pname == "threadscope" = deriv { configureFlags = Set.insert "--ghc-options=-rtsopts" configureFlags }

187 | pname == "threadscope" = deriv { configureFlags = Set.insert "--ghc-options=-rtsopts" configureFlags }

187− | pname == "thyme" = deriv { buildTools = Set.insert "cpphs" buildTools }

188 | pname == "vacuum" = deriv { extraLibs = Set.insert "ghc-paths" extraLibs }

189 | pname == "wxcore" = deriv { extraLibs = Set.fromList ["wxGTK","mesa","libX11"] `Set.union` extraLibs }

190 | pname == "X11" && version >= Version [1,6] []

src/hackage2nix.hs−1

@@ -3409,7 +3409,6 @@ defaultConfiguration = Configuration

3409 , "thrift"

3410 , "Thrift"

3411 , "throttle"

3412− , "thyme"

3413 , "tianbar"

3412 , "tianbar"

3414 , "tic-tac-toe"

3413 , "tic-tac-toe"

3415 , "TicTacToe"

3414 , "TicTacToe"