diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 10:32:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:59:33 +0200 |
| commit | 0c74f18e4c3ac32af94a84df85c3e4ad1ad2a7b7 (patch) | |
| tree | 775ac2949498971a493bb10c85d92ff4679a67eb /pkgs/development/libraries/cairo | |
| parent | 6521957bf4057806ca01efdd92406b41c10a38c2 (diff) | |
xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 47a2c63d3283..e2d6b25e137d 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty -, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs +, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; propagatedBuildInputs = - with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ] + with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ] ++ optional (!stdenv.isDarwin) libXrender ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib |