@@ -35,22 +35,23 @@ fixGtkBuilds drv = drv & dependencies . pkgconfig %~ Set.filter (not . collidesW
3535hooks :: [(Dependency, Derivation -> Derivation)]
3636hooks =
3737 [ ("Agda", set (executableDepends . tool . contains (pkg "emacs")) True . set phaseOverrides agdaPostInstall)
38− , ("dns", set testTarget "spec") -- don't execute tests that try to access the network
3938 , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xlibs.libXext", bind "pkgs.xlibs.libXfixes"])))
4039 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
4140 , ("darcs", set phaseOverrides darcsInstallPostInstall)
41+ , ("dns", set testTarget "spec") -- don't execute tests that try to access the network
4242 , ("eventstore", over (metaSection . platforms) (Set.filter (\(Platform arch _) -> arch == X86_64)))
43− , ("git-annex", gitAnnexHook)
44− , ("haddock", set phaseOverrides "preCheck = \"unset GHC_PACKAGE_PATH\";")
45− , ("HFuse", set phaseOverrides hfusePreConfigure)
46− , ("hmatrix", set phaseOverrides "preConfigure = \"sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'\";")
4743 , ("gf", set phaseOverrides gfPhaseOverrides . set doCheck False)
44+ , ("git-annex", gitAnnexHook)
4845 , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)
4946 , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
5047 , ("gtk3", gtk3Hook)
51− , ("libconfig", over (libraryDepends . system) (Set.insert (pkg "libconfig") . Set.delete (binding # ("config", path # ["null"]))))
48+ , ("haddock", set phaseOverrides "preCheck = \"unset GHC_PACKAGE_PATH\";")
49+ , ("HFuse", set phaseOverrides hfusePreConfigure)
50+ , ("hmatrix", set phaseOverrides "preConfigure = \"sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'\";")
51+ , ("hslua", over (libraryDepends . pkgconfig) (Set.insert (pkg "lua5_1") . Set.delete (pkg "lua")))
5252 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136
5353 , ("jsaddle", set (dependencies . haskell . contains (bind "self.ghcjs-base")) False)
54+ , ("libconfig", over (libraryDepends . system) (Set.insert (pkg "libconfig") . Set.delete (binding # ("config", path # ["null"]))))
5455 , ("liquid-fixpoint", set (executableDepends . system . contains (pkg "ocaml")) True . set (testDepends . system . contains (pkg "z3")) True)
5556 , ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)
5657 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)
@@ -60,10 +61,10 @@ hooks =
6061 , ("target", set (testDepends . system . contains (pkg "z3")) True)
6162 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)
6263 , ("thyme", set (libraryDepends . tool . contains (bind "self.cpphs")) True) -- required on Darwin
63− , ("xmonad", set phaseOverrides xmonadPostInstall)
64− , ("wxc", wxcHook)
6564 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
65+ , ("wxc", wxcHook)
6666 , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xlibs.libXinerama","pkgs.xlibs.libXext","pkgs.xlibs.libXrender"])))
67+ , ("xmonad", set phaseOverrides xmonadPostInstall)
6768 ]
6869
6970pkg :: Identifier -> Binding