ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

cairo: get rid of xlibs-wrapper

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-06 19:57:45 +02:00
parent d500232fcc
commit fd819711c6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
propagatedBuildInputs = propagatedBuildInputs =
with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ] with xorg; [ libXext fontconfig expat freetype pixman zlib libpng ]
++ optional (!stdenv.isDarwin) libXrender ++ optional (!stdenv.isDarwin) libXrender
++ optionals xcbSupport [ libxcb xcbutil ] ++ optionals xcbSupport [ libxcb xcbutil ]
++ optional gobjectSupport glib ++ optional gobjectSupport glib
++ optionals glSupport [ mesa_noglu ] ++ optional glSupport mesa_noglu
; ; # TODO: maybe liblzo but what would it be for here?
configureFlags = [ "--enable-tee" ] configureFlags = [ "--enable-tee" ]
++ optional xcbSupport "--enable-xcb" ++ optional xcbSupport "--enable-xcb"
@ -38,14 +38,14 @@ stdenv.mkDerivation rec {
preConfigure = preConfigure =
# On FreeBSD, `-ldl' doesn't exist. # On FreeBSD, `-ldl' doesn't exist.
(stdenv.lib.optionalString stdenv.isFreeBSD stdenv.lib.optionalString stdenv.isFreeBSD
'' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
do do
cat "$i" | sed -es/-ldl//g > t cat "$i" | sed -es/-ldl//g > t
mv t "$i" mv t "$i"
done done
'') ''
+ +
'' ''
# Work around broken `Requires.private' that prevents Freetype # Work around broken `Requires.private' that prevents Freetype
# `-I' flags to be propagated. # `-I' flags to be propagated.