git.iko.soy/typeable/cabal2nix
on master help sign in
Fix post-process hooks for jsaddle and pango.
62d9dfePeter Simons
src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−2
compare with master
unifiedsplit
@@ -46,9 +46,8 @@ hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ sh
46 , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
46 , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
47 , ("gtk3", gtk3Hook)
47 , ("gtk3", gtk3Hook)
48 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136
48 , ("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)
50 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)
50 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)
51− , ("pango", set (libraryDepends . haskell . contains (pkg "cairo")) True)
52 , ("readline", over (libraryDepends . system) (Set.union (pkgs ["readline", "ncurses"])))
51 , ("readline", over (libraryDepends . system) (Set.union (pkgs ["readline", "ncurses"])))
53 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)
52 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)
54 , ("thyme", set (libraryDepends . tool . contains (pkg "cpphs")) True) -- required on Darwin
53 , ("thyme", set (libraryDepends . tool . contains (pkg "cpphs")) True) -- required on Darwin