62d9dfe · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

Fix post-process hooks for jsaddle and pango.

commit62d9dfeaf7fe2e83084e00b0e1742f2a3a504551 authorPeter Simons <simons@cryp.to> dateWed 26 Aug 2015, 21:48 (11 years ago) parentec510ec

1 file changed+1−2

unifiedsplit

src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−2

@@ -46,9 +46,8 @@ hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ sh

4646 , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)

4747 , ("gtk3", gtk3Hook)

4848 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136

49− , ("jsaddle", set (dependencies . haskell . contains (pkg "ghcjs-base")) False)

49+ , ("jsaddle", set (dependencies . haskell . contains (bind "self.ghcjs-base")) False)

5050 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)

51− , ("pango", set (libraryDepends . haskell . contains (pkg "cairo")) True)

5251 , ("readline", over (libraryDepends . system) (Set.union (pkgs ["readline", "ncurses"])))

5352 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)

5453 , ("thyme", set (libraryDepends . tool . contains (pkg "cpphs")) True) -- required on Darwin