@@ -25,7 +25,7 @@ hooks :: [(Dependency, Derivation -> Derivation)]
25hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ show str)) (simpleParse str))
25hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ show str)) (simpleParse str))
26 [ ("Agda", set (executableDepends . tool . contains (pkg "emacs")) True . set phaseOverrides agdaPostInstall)
26 [ ("Agda", set (executableDepends . tool . contains (pkg "emacs")) True . set phaseOverrides agdaPostInstall)
27 , ("dns", set testTarget "spec") -- don't execute tests that try to access the network
27 , ("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"])))
29 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
29 , ("cabal-install", set phaseOverrides cabalInstallPostInstall)
30 , ("darcs", set phaseOverrides darcsInstallPostInstall)
30 , ("darcs", set phaseOverrides darcsInstallPostInstall)
31 , ("git-annex", gitAnnexHook)
31 , ("git-annex", gitAnnexHook)
@@ -45,7 +45,7 @@ hooks = over (mapped._1) (\str -> fromMaybe (error ("invalid constraint: " ++ sh
45 , ("monad", set phaseOverrides xmonadPostInstall)
45 , ("monad", set phaseOverrides xmonadPostInstall)
46 , ("wxc", wxcHook)
46 , ("wxc", wxcHook)
47 , ("wxcore", set (libraryDepends . pkgconfig . contains (pkg "wxGTK")) True)
47 , ("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"])))
51pkg :: Identifier -> Binding
51pkg :: Identifier -> Binding