diff options
| author | Peter Simons <simons@cryp.to> | 2011-09-05 19:24:01 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-09-05 19:24:01 +0000 |
| commit | e373f558da33a06e140f435999b0219532221b26 (patch) | |
| tree | 02ed63b466d2148b7fde742deb0303bc61f6224d /pkgs/development/libraries | |
| parent | 378009ff4a9b014c5a8f9381549575161acb55cd (diff) | |
| download | nixlib-e373f558da33a06e140f435999b0219532221b26.tar nixlib-e373f558da33a06e140f435999b0219532221b26.tar.gz nixlib-e373f558da33a06e140f435999b0219532221b26.tar.bz2 nixlib-e373f558da33a06e140f435999b0219532221b26.tar.lz nixlib-e373f558da33a06e140f435999b0219532221b26.tar.xz nixlib-e373f558da33a06e140f435999b0219532221b26.tar.zst nixlib-e373f558da33a06e140f435999b0219532221b26.zip | |
haskell-X11: updated build expression
svn path=/nixpkgs/trunk/; revision=29036
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/haskell/X11/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
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"; |