diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index f8eef4dcb366..9d01b2fdd863 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -1,12 +1,11 @@ -{cabal, syb, libX11, xineramaSupport ? true, libXinerama ? null, libXext ? null}: +{ cabal, libX11, libXext, libXinerama, syb }: -assert xineramaSupport -> (libXinerama != null && libXext != null); - -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "X11"; version = "1.5.0.0"; sha256 = "653ff8aa4053574a36dbb1729459df6e5a1a87a223bc3eeced8e40c6e3a5406f"; - propagatedBuildInputs = [libX11 syb] ++ (if xineramaSupport then [libXinerama libXext] else []); + buildDepends = [ syb ]; + extraLibraries = [ libX11 libXext libXinerama ]; meta = { homepage = "http://code.haskell.org/X11"; description = "A binding to the X11 graphics library"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c217b97fae4..b3cb53f34df8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1283,10 +1283,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; - X11 = callPackage ../development/libraries/haskell/X11 { - inherit (pkgs.xlibs) libX11 libXinerama libXext; - xineramaSupport = true; - }; + X11 = callPackage ../development/libraries/haskell/X11 {}; X11Xft = callPackage ../development/libraries/haskell/X11-xft { inherit (pkgs) pkgconfig freetype fontconfig;