public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xlibs.xlibs: remove

Browse Source 
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`.
This commit is contained in:
Vladimír Čunát
2015-09-15 10:32:57 +02:00
parent 6521957bf4
commit 0c74f18e4c
12 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/cairo/default.nix
View File

@@ -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