git.iko.soy/typeable/cabal2nix
on master help sign in
Add cpphs build tool to "thyme" to fix the build on Darwin.
commit1c8616f79220dde844a1e89e60fe0ceb8b3328cb authorPeter Simons <simons@cryp.to> dateFri 7 Aug 2015, 19:56 (11 years ago) parentb5bd4bf
2 files changed+1−2
src/Cabal2Nix/PostProcess.hs+1−1 src/hackage2nix.hs−1
src/Cabal2Nix/PostProcess.hs+1−1
@@ -36,6 +36,7 @@ hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ sh
3636 , ("pango", set (libraryDepends . haskell . contains (dep "cairo")) True)
3737 , ("readline", over (libraryDepends . system) (Set.union (Set.fromList [dep "readline", dep "ncurses"])))
3838 , ("terminfo", set (libraryDepends . system . contains (dep "ncurses")) True)
39+ , ("thyme", set (libraryDepends . tool . contains (dep "cpphs")) True) -- required on Darwin
3940 , ("monad", set phaseOverrides xmonadPostInstall)
4041 , ("wxc", wxcHook)
4142 , ("wxcore", set (libraryDepends . pkgconfig . contains (dep "wxGTK")) True)
@@ -184,7 +185,6 @@ postProcess' deriv@(MkDerivation {..})
184185 }
185186 | pname == "target" = deriv { buildTools = Set.insert "z3" buildTools }
186187 | pname == "threadscope" = deriv { configureFlags = Set.insert "--ghc-options=-rtsopts" configureFlags }
187− | pname == "thyme" = deriv { buildTools = Set.insert "cpphs" buildTools }
188188 | pname == "vacuum" = deriv { extraLibs = Set.insert "ghc-paths" extraLibs }
189189 | pname == "wxcore" = deriv { extraLibs = Set.fromList ["wxGTK","mesa","libX11"] `Set.union` extraLibs }
190190 | pname == "X11" && version >= Version [1,6] []
src/hackage2nix.hs−1
@@ -3409,7 +3409,6 @@ defaultConfiguration = Configuration
34093409 , "thrift"
34103410 , "Thrift"
34113411 , "throttle"
3412− , "thyme"
34133412 , "tianbar"
34143413 , "tic-tac-toe"
34153414 , "TicTacToe"