diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-06 19:57:45 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:50 +0200 |
| commit | fd819711c6787996bfc3bb140fff9edee9410b0b (patch) | |
| tree | 62f37a236512fafd9d5baf7c3001d1e3b6ff971c | |
| parent | d500232fcce00df8fc8098d82b4b03a3db6a6c03 (diff) | |
| download | nixlib-fd819711c6787996bfc3bb140fff9edee9410b0b.tar nixlib-fd819711c6787996bfc3bb140fff9edee9410b0b.tar.gz nixlib-fd819711c6787996bfc3bb140fff9edee9410b0b.tar.bz2 nixlib-fd819711c6787996bfc3bb140fff9edee9410b0b.tar.lz nixlib-fd819711c6787996bfc3bb140fff9edee9410b0b.tar.xz nixlib-fd819711c6787996bfc3bb140fff9edee9410b0b.tar.zst nixlib-fd819711c6787996bfc3bb140fff9edee9410b0b.zip | |
cairo: get rid of xlibs-wrapper
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 18a9a7aa051f..7dce7d49b962 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; propagatedBuildInputs = - with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ] + with xorg; [ libXext fontconfig expat freetype pixman zlib libpng ] ++ optional (!stdenv.isDarwin) libXrender ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib - ++ optionals glSupport [ mesa_noglu ] - ; + ++ optional glSupport mesa_noglu + ; # TODO: maybe liblzo but what would it be for here? configureFlags = [ "--enable-tee" ] ++ optional xcbSupport "--enable-xcb" @@ -38,14 +38,14 @@ stdenv.mkDerivation rec { preConfigure = # 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 do cat "$i" | sed -es/-ldl//g > t mv t "$i" done - '') - + + '' + + '' # Work around broken `Requires.private' that prevents Freetype # `-I' flags to be propagated. |