@@ -25,7 +25,7 @@ hooks :: [(Dependency, Derivation -> Derivation)]
2525hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ show str)) (simpleParse str))
2626 [ ("Agda", set (executableDepends . tool . contains (pkg "emacs")) True . set phaseOverrides agdaPostInstall)
2727 , ("dns", set testTarget "spec") -- don't execute tests that try to access the network
28− , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [pkg "libXext", pkg "libXfixes"])))
28+ , ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xlibs.libXext", bind "pkgs.xlibs.libXfixes"])))
2929 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
3030 , ("darcs", set phaseOverrides darcsInstallPostInstall)
3131 , ("git-annex", gitAnnexHook)
@@ -45,7 +45,7 @@ hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ sh
4545 , ("monad", set phaseOverrides xmonadPostInstall)
4646 , ("wxc", wxcHook)
4747 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
48− , ("X11", over (libraryDepends . system) (Set.union (pkgs ["libXinerama","libXext","libXrender"])))
48+ , ("X11", over (libraryDepends . system) (Set.union (Set.fromList $ map bind ["pkgs.xlibs.libXinerama","pkgs.xlibs.libXext","pkgs.xlibs.libXrender"])))
4949 ]
5050
5151pkg :: Identifier -> Binding