@@ -34,6 +34,7 @@ hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ sh
34 , ("mysql", set (libraryDepends . system . contains (dep "mysql")) True)
34 , ("mysql", set (libraryDepends . system . contains (dep "mysql")) True)
35 , ("pango", set (libraryDepends . haskell . contains (dep "cairo")) True)
35 , ("pango", set (libraryDepends . haskell . contains (dep "cairo")) True)
36 , ("readline", over (libraryDepends . system) (Set.union (Set.fromList [dep "readline", dep "ncurses"])))
36 , ("readline", over (libraryDepends . system) (Set.union (Set.fromList [dep "readline", dep "ncurses"])))
37+ , ("terminfo", set (libraryDepends . system . contains (dep "ncurses")) True)
37 , ("monad", set phaseOverrides xmonadPostInstall)
38 , ("monad", set phaseOverrides xmonadPostInstall)
38 , ("wxc", wxcHook)
39 , ("wxc", wxcHook)
39 , ("wxcore", set (libraryDepends . pkgconfig . contains (dep "wxGTK")) True)
40 , ("wxcore", set (libraryDepends . pkgconfig . contains (dep "wxGTK")) True)
@@ -154,7 +155,6 @@ postProcess' deriv@(MkDerivation {..})
154 | pname == "HList" = deriv { buildTools = Set.insert "diffutils" buildTools }
155 | pname == "HList" = deriv { buildTools = Set.insert "diffutils" buildTools }
155 | pname == "hmatrix" = deriv { extraLibs = Set.insert "liblapack" (Set.insert "blas" (Set.filter (/= "lapack") extraLibs)) }
156 | pname == "hmatrix" = deriv { extraLibs = Set.insert "liblapack" (Set.insert "blas" (Set.filter (/= "lapack") extraLibs)) }
156 | pname == "hmatrix-special" = deriv { extraLibs = Set.insert "gsl" extraLibs }
157 | pname == "hmatrix-special" = deriv { extraLibs = Set.insert "gsl" extraLibs }
157− | pname == "hoogle" = deriv { testTarget = "--test-option=--no-net" }
158 | pname == "idris" = deriv { buildTools = Set.insert "happy" buildTools, extraLibs = Set.insert "gmp" (Set.insert "boehmgc" extraLibs) }
158 | pname == "idris" = deriv { buildTools = Set.insert "happy" buildTools, extraLibs = Set.insert "gmp" (Set.insert "boehmgc" extraLibs) }
159 | pname == "inline-c-cpp" = deriv { testDepends = Set.delete "stdc++" testDepends }
159 | pname == "inline-c-cpp" = deriv { testDepends = Set.delete "stdc++" testDepends }
160 | pname == "language-c-quote" = deriv { buildTools = Set.insert "alex" (Set.insert "happy" buildTools) }
160 | pname == "language-c-quote" = deriv { buildTools = Set.insert "alex" (Set.insert "happy" buildTools) }
@@ -163,9 +163,6 @@ postProcess' deriv@(MkDerivation {..})
163 | pname == "libffi" = deriv { extraLibs = Set.delete "ffi" extraLibs }
163 | pname == "libffi" = deriv { extraLibs = Set.delete "ffi" extraLibs }
164 | pname == "liquid-fixpoint" = deriv { buildTools = Set.insert "z3" (Set.insert "ocaml" buildTools), configureFlags = Set.insert "-fbuild-external" configureFlags }
164 | pname == "liquid-fixpoint" = deriv { buildTools = Set.insert "z3" (Set.insert "ocaml" buildTools), configureFlags = Set.insert "-fbuild-external" configureFlags }
165 | pname == "liquidhaskell" = deriv { buildTools = Set.insert "z3" buildTools }
165 | pname == "liquidhaskell" = deriv { buildTools = Set.insert "z3" buildTools }
166− | pname == "llvm-base" = deriv { extraLibs = Set.insert "llvm" extraLibs }
167− | pname == "llvm-general" = deriv { doCheck = False }
168− | pname == "llvm-general-pure"= deriv { doCheck = False }
169 | pname == "MFlow" = deriv { buildTools = Set.insert "cpphs" buildTools }
166 | pname == "MFlow" = deriv { buildTools = Set.insert "cpphs" buildTools }
170 | pname == "multiarg" = deriv { buildDepends = Set.insert "utf8-string" buildDepends }
167 | pname == "multiarg" = deriv { buildDepends = Set.insert "utf8-string" buildDepends }
171 | pname == "ncurses" = deriv { phaseOverrides = ncursesPatchPhase }
168 | pname == "ncurses" = deriv { phaseOverrides = ncursesPatchPhase }
@@ -173,7 +170,6 @@ postProcess' deriv@(MkDerivation {..})
173 | pname == "OpenAL" = deriv { extraLibs = Set.insert "openal" extraLibs }
170 | pname == "OpenAL" = deriv { extraLibs = Set.insert "openal" extraLibs }
174 | pname == "OpenGL" = deriv { extraLibs = Set.insert "mesa" (Set.insert "libX11" extraLibs) }
171 | pname == "OpenGL" = deriv { extraLibs = Set.insert "mesa" (Set.insert "libX11" extraLibs) }
175 | pname == "pandoc" = deriv { buildDepends = Set.insert "alex" (Set.insert "happy" buildDepends) }
172 | pname == "pandoc" = deriv { buildDepends = Set.insert "alex" (Set.insert "happy" buildDepends) }
176− | pname == "pcap" = deriv { extraLibs = Set.insert "libpcap" extraLibs }
177 | pname == "persistent" = deriv { extraLibs = Set.insert "sqlite3" extraLibs }
173 | pname == "persistent" = deriv { extraLibs = Set.insert "sqlite3" extraLibs }
178 | pname == "purescript" = deriv { buildTools = Set.insert "nodejs" buildTools }
174 | pname == "purescript" = deriv { buildTools = Set.insert "nodejs" buildTools }
179 | pname == "repa-algorithms" = deriv { extraLibs = Set.insert "llvm" extraLibs }
175 | pname == "repa-algorithms" = deriv { extraLibs = Set.insert "llvm" extraLibs }
@@ -187,7 +183,6 @@ postProcess' deriv@(MkDerivation {..})
187 , phaseOverrides = structuredHaskellModePostInstall
183 , phaseOverrides = structuredHaskellModePostInstall
189 | pname == "target" = deriv { buildTools = Set.insert "z3" buildTools }
185 | pname == "target" = deriv { buildTools = Set.insert "z3" buildTools }
190− | pname == "terminfo" = deriv { extraLibs = Set.insert "ncurses" extraLibs }
191 | pname == "threadscope" = deriv { configureFlags = Set.insert "--ghc-options=-rtsopts" configureFlags }
186 | pname == "threadscope" = deriv { configureFlags = Set.insert "--ghc-options=-rtsopts" configureFlags }
192 | pname == "thyme" = deriv { buildTools = Set.insert "cpphs" buildTools }
187 | pname == "thyme" = deriv { buildTools = Set.insert "cpphs" buildTools }
193 | pname == "vacuum" = deriv { extraLibs = Set.insert "ghc-paths" extraLibs }
188 | pname == "vacuum" = deriv { extraLibs = Set.insert "ghc-paths" extraLibs }